Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Christoph Hellwig and committed by
Linus Torvalds
564de74a 7019e7e4

+1 -3
+1 -1
drivers/block/cciss.c
··· 3118 3118 * 8 controller support. 3119 3119 */ 3120 3120 if (i < MAX_CTLR_ORIG) 3121 - hba[i]->major = MAJOR_NR + i; 3121 + hba[i]->major = COMPAQ_CISS_MAJOR + i; 3122 3122 rc = register_blkdev(hba[i]->major, hba[i]->devname); 3123 3123 if(rc == -EBUSY || rc == -EINVAL) { 3124 3124 printk(KERN_ERR
-2
drivers/block/cciss.h
··· 13 13 #define IO_OK 0 14 14 #define IO_ERROR 1 15 15 16 - #define MAJOR_NR COMPAQ_CISS_MAJOR 17 - 18 16 struct ctlr_info; 19 17 typedef struct ctlr_info ctlr_info_t; 20 18