diff --git a/[refs] b/[refs] index 2505d0b7773d..50e56bde0be0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f9d99c12a533809342b475c95452e82761bcc1c +refs/heads/master: 3dbd8c2e3ff0185585e068f190289d2a267a3e83 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index f30b4618c02c..3efc0bceada2 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -46,8 +46,6 @@ #include #include -#define MAJOR_NR MD_MAJOR - /* 63 partitions with the alternate major number (mdp) */ #define MdpMinorShift 6 @@ -6503,13 +6501,13 @@ static void md_geninit(void) static int __init md_init(void) { - if (register_blkdev(MAJOR_NR, "md")) + if (register_blkdev(MD_MAJOR, "md")) return -1; if ((mdp_major=register_blkdev(0, "mdp"))<=0) { - unregister_blkdev(MAJOR_NR, "md"); + unregister_blkdev(MD_MAJOR, "md"); return -1; } - blk_register_region(MKDEV(MAJOR_NR, 0), 1UL<