aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-08 01:05:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:14:09 -0800
commit564de74a7e2778e1d11b2d2e50ee8dab1cf1456a (patch)
tree25b1ba320ac19aeb4bafecab2abc25c05d4a085d
parent7019e7e41e34388cb87a5f0e3d05e92992418f34 (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>
-rw-r--r--drivers/block/cciss.c2
-rw-r--r--drivers/block/cciss.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 74818cc6509..88452c79fb6 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,
* 8 controller support.
*/
if (i < MAX_CTLR_ORIG)
- hba[i]->major = MAJOR_NR + i;
+ hba[i]->major = COMPAQ_CISS_MAJOR + i;
rc = register_blkdev(hba[i]->major, hba[i]->devname);
if(rc == -EBUSY || rc == -EINVAL) {
printk(KERN_ERR
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index ad45e581a91..b24fc0553cc 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -13,8 +13,6 @@
#define IO_OK 0
#define IO_ERROR 1
-#define MAJOR_NR COMPAQ_CISS_MAJOR
-
struct ctlr_info;
typedef struct ctlr_info ctlr_info_t;