[PATCH] cciss: avoid defining useless MAJOR_NR macro

From: Adrian Bunk
Date: Fri Jan 06 2006 - 15:54:33 EST


From: Christoph Hellwig <hch@xxxxxx>

this sneaked in with one of the updates


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

This patch was sent by Christoph Hellwig on:
- 4 May 2005

--- 1.136/drivers/block/cciss.c 2005-03-10 09:38:39 +01:00
+++ edited/drivers/block/cciss.c 2005-03-12 09:12:51 +01:00
@@ -2762,7 +2762,7 @@
* 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
--- 1.27/drivers/block/cciss.h 2005-03-10 09:38:39 +01:00
+++ edited/drivers/block/cciss.h 2005-03-12 09:12:30 +01:00
@@ -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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/