On Wed, 13 Jun 2007 19:52:32 +0100 Ralf Baechle <ralf@xxxxxxxxxxxxxx> wrote: > On Mon, Jun 11, 2007 at 03:08:55PM +0200, Franck Bui-Huu wrote: > > > Momenco Ocelot C support is deprecated and scheduled for removal > > since September 2006. > > And totally untested since ages. 2.6.22 will be its last summer ;-) > > Patch queued up to 2.6.23, actually already a few days ago. Please queue this patch too. Yoichi Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> --- Already dropped Momenco Ocelot C/G boards support. also remove their MTD support. diff -pruN -X mips/Documentation/dontdiff mips-orig/drivers/mtd/devices/docprobe.c mips/drivers/mtd/devices/docprobe.c --- mips-orig/drivers/mtd/devices/docprobe.c 2007-06-14 13:22:04.698797000 +0900 +++ mips/drivers/mtd/devices/docprobe.c 2007-06-14 13:19:38.473658500 +0900 @@ -84,8 +84,6 @@ static unsigned long __initdata doc_loca #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, 0xff000000, -#elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) - 0xff000000, #else #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif diff -pruN -X mips/Documentation/dontdiff mips-orig/drivers/mtd/nand/diskonchip.c mips/drivers/mtd/nand/diskonchip.c --- mips-orig/drivers/mtd/nand/diskonchip.c 2007-06-14 13:22:05.482846000 +0900 +++ mips/drivers/mtd/nand/diskonchip.c 2007-06-14 13:19:12.008004500 +0900 @@ -59,8 +59,6 @@ static unsigned long __initdata doc_loca #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, 0xff000000, -#elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) - 0xff000000, #else #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif
