From db2968654454c1354ae2003a58829f98466ede93 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 28 Jun 2007 20:13:27 +0100 Subject: [PATCH] --- yaml --- r: 68451 b: refs/heads/master c: 4854b75c7795604ea6a0b6b7f549f145813343d0 h: refs/heads/master i: 68449: 414b59503425e37a1342b1057b0e9e9409364331 68447: e1c4ee40ffef93ca2df12523868c58825a2f38ef v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/nettel.c | 4 ---- trunk/drivers/mtd/maps/pmcmsp-ramroot.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fca8b65cf6f0..49b6a303491f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e716dd3644c2a79d6ffa4359bac06f57479dcb34 +refs/heads/master: 4854b75c7795604ea6a0b6b7f549f145813343d0 diff --git a/trunk/drivers/mtd/maps/nettel.c b/trunk/drivers/mtd/maps/nettel.c index 7b96cd02f82b..88525622e967 100644 --- a/trunk/drivers/mtd/maps/nettel.c +++ b/trunk/drivers/mtd/maps/nettel.c @@ -421,10 +421,6 @@ int __init nettel_init(void) intel_mtd->owner = THIS_MODULE; -#ifndef CONFIG_BLK_DEV_INITRD - ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, 1); -#endif - num_intel_partitions = sizeof(nettel_intel_partitions) / sizeof(nettel_intel_partitions[0]); diff --git a/trunk/drivers/mtd/maps/pmcmsp-ramroot.c b/trunk/drivers/mtd/maps/pmcmsp-ramroot.c index 18049bceba8d..30de5c0c09a9 100644 --- a/trunk/drivers/mtd/maps/pmcmsp-ramroot.c +++ b/trunk/drivers/mtd/maps/pmcmsp-ramroot.c @@ -79,7 +79,6 @@ static int __init init_rrmap(void) rr_mtd->owner = THIS_MODULE; add_mtd_device(rr_mtd); - ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, rr_mtd->index); return 0; }