From a858117fcb7de27770c770b926471f2caf82f995 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Wed, 11 Jul 2007 11:36:56 +0900 Subject: [PATCH] --- yaml --- r: 68482 b: refs/heads/master c: a2e96b627b58efe2d618a415f34b9b9d9f829bd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/docprobe.c | 2 -- trunk/drivers/mtd/nand/diskonchip.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ae9e04f29823..0e61889eff1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db1b39d8b860e3716620c225bc86e0ec41764e34 +refs/heads/master: a2e96b627b58efe2d618a415f34b9b9d9f829bd6 diff --git a/trunk/drivers/mtd/devices/docprobe.c b/trunk/drivers/mtd/devices/docprobe.c index b96ac8e119dc..d574916e7821 100644 --- a/trunk/drivers/mtd/devices/docprobe.c +++ b/trunk/drivers/mtd/devices/docprobe.c @@ -84,8 +84,6 @@ static unsigned long __initdata doc_locations[] = { #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, 0xff000000, -#elif defined(CONFIG_MOMENCO_OCELOT_G) - 0xff000000, ##else #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif diff --git a/trunk/drivers/mtd/nand/diskonchip.c b/trunk/drivers/mtd/nand/diskonchip.c index 17c868034aad..5f3049a424c4 100644 --- a/trunk/drivers/mtd/nand/diskonchip.c +++ b/trunk/drivers/mtd/nand/diskonchip.c @@ -59,8 +59,6 @@ static unsigned long __initdata doc_locations[] = { #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, 0xff000000, -#elif defined(CONFIG_MOMENCO_OCELOT_G) - 0xff000000, #else #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif