git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
block
/
aoe
/
aoechr.c
diff --git
a/drivers/block/aoe/aoechr.c
b/drivers/block/aoe/aoechr.c
index
5327f55
..
1bc1cf9
100644
(file)
--- a/
drivers/block/aoe/aoechr.c
+++ b/
drivers/block/aoe/aoechr.c
@@
-162,7
+162,7
@@
aoechr_open(struct inode *inode, struct file *filp)
{
int n, i;
- n =
MINOR(inode->i_rdev
);
+ n =
iminor(inode
);
filp->private_data = (void *) (unsigned long) n;
for (i = 0; i < ARRAY_SIZE(chardevs); ++i)