From: Christoph Hellwig this sneaked in with one of the updates Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- drivers/block/cciss.c | 2 +- drivers/block/cciss.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/block/cciss.c~cciss-avoid-defining-useless-major_nr-macro drivers/block/cciss.c --- devel/drivers/block/cciss.c~cciss-avoid-defining-useless-major_nr-macro 2006-01-06 23:49:42.000000000 -0800 +++ devel-akpm/drivers/block/cciss.c 2006-01-06 23:49:42.000000000 -0800 @@ -3118,7 +3118,7 @@ static int __devinit cciss_init_one(stru * 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 -puN drivers/block/cciss.h~cciss-avoid-defining-useless-major_nr-macro drivers/block/cciss.h --- devel/drivers/block/cciss.h~cciss-avoid-defining-useless-major_nr-macro 2006-01-06 23:49:42.000000000 -0800 +++ devel-akpm/drivers/block/cciss.h 2006-01-06 23:49:42.000000000 -0800 @@ -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; _