diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/block/aoe/aoechr.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/aoe/aoechr.c')
| -rw-r--r-- | drivers/block/aoe/aoechr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 5327f553b4f5..1bc1cf9603f1 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c | |||
| @@ -162,7 +162,7 @@ aoechr_open(struct inode *inode, struct file *filp) | |||
| 162 | { | 162 | { |
| 163 | int n, i; | 163 | int n, i; |
| 164 | 164 | ||
| 165 | n = MINOR(inode->i_rdev); | 165 | n = iminor(inode); |
| 166 | filp->private_data = (void *) (unsigned long) n; | 166 | filp->private_data = (void *) (unsigned long) n; |
| 167 | 167 | ||
| 168 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) | 168 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) |