diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/block/aoe/aoechr.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
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) |