Skip to content

Commit

Permalink
[PATCH] cciss: avoid defining useless MAJOR_NR macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed Jan 9, 2006
1 parent 7019e7e commit 564de74
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/block/cciss.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 564de74

Please sign in to comment.