Commit 564de74a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] cciss: avoid defining useless MAJOR_NR macro 



This sneaked in with one of the updates.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7019e7e4

drivers/block/cciss.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/block/cciss.h

+0 −2
Original line number Diff line number Diff line
@@ -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;