diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-08 04:05:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:09 -0500 |
| commit | 564de74a7e2778e1d11b2d2e50ee8dab1cf1456a (patch) | |
| tree | 25b1ba320ac19aeb4bafecab2abc25c05d4a085d /drivers/block/cciss.c | |
| parent | 7019e7e41e34388cb87a5f0e3d05e92992418f34 (diff) | |
[PATCH] cciss: avoid defining useless MAJOR_NR macro
This sneaked in with one of the updates.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 74818cc6509b..88452c79fb64 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -3118,7 +3118,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
| 3118 | * 8 controller support. | 3118 | * 8 controller support. |
| 3119 | */ | 3119 | */ |
| 3120 | if (i < MAX_CTLR_ORIG) | 3120 | if (i < MAX_CTLR_ORIG) |
| 3121 | hba[i]->major = MAJOR_NR + i; | 3121 | hba[i]->major = COMPAQ_CISS_MAJOR + i; |
| 3122 | rc = register_blkdev(hba[i]->major, hba[i]->devname); | 3122 | rc = register_blkdev(hba[i]->major, hba[i]->devname); |
| 3123 | if(rc == -EBUSY || rc == -EINVAL) { | 3123 | if(rc == -EBUSY || rc == -EINVAL) { |
| 3124 | printk(KERN_ERR | 3124 | printk(KERN_ERR |