diff --git a/[refs] b/[refs]
index bf6378e0d54f..a8163c4d3f70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7019e7e41e34388cb87a5f0e3d05e92992418f34
+refs/heads/master: 564de74a7e2778e1d11b2d2e50ee8dab1cf1456a
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 74818cc6509b..88452c79fb64 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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/trunk/drivers/block/cciss.h b/trunk/drivers/block/cciss.h
index ad45e581a91d..b24fc0553ccf 100644
--- a/trunk/drivers/block/cciss.h
+++ b/trunk/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;