aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 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
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index ad45e581a91d..b24fc0553ccf 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -13,8 +13,6 @@
13#define IO_OK 0 13#define IO_OK 0
14#define IO_ERROR 1 14#define IO_ERROR 1
15 15
16#define MAJOR_NR COMPAQ_CISS_MAJOR
17
18struct ctlr_info; 16struct ctlr_info;
19typedef struct ctlr_info ctlr_info_t; 17typedef struct ctlr_info ctlr_info_t;
20 18