summaryrefslogtreecommitdiff
path: root/drivers/char/mem.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-08-30 23:45:59 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-08-30 23:45:59 -0700
commitc334ec3406bd4e366a4138570332d4e19fa70128 (patch)
treed465dd090c583e8646a98bf570a287c643ba66cb /drivers/char/mem.c
parented8dff304648833f2acf9b3189a1e611355111b0 (diff)
parent9b9f98eec3f1f66d0186f7c95e3d724cf3b6765b (diff)
Merge http://lia64.bkbits.net/to-linus-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers/char/mem.c')
-rw-r--r--drivers/char/mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 7f1464f3e6b8..82b44f1c1a13 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -607,7 +607,7 @@ static struct file_operations kmsg_fops = {
static int memory_open(struct inode * inode, struct file * filp)
{
- switch (minor(inode->i_rdev)) {
+ switch (iminor(inode)) {
case 1:
filp->f_op = &mem_fops;
break;