![]() | |||||||||||||
Messages in this thread
Patch in this message |
The following difference was found between the mainline and linux-mips kernel. Fix the #else directive in the docprobe driver, and change some space to tabs for consistency. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> --- linux-2.6/drivers/mtd/devices/docprobe.c 2006-03-05 19:35:04.000000000 +0000 +++ mips.git/drivers/mtd/devices/docprobe.c 2006-03-05 18:51:15.000000000 +0000 @@ -84,10 +84,10 @@ 0xe4000000, #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, - 0xff000000, + 0xff000000, #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) - 0xff000000, -##else + 0xff000000, +#else #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif 0xffffffff }; -- Martin Michlmayr http://www.cyrius.com/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | ||||||||||||
| Last update: 2006-03-20 04:46 [from the cache] ©2003-2008 | |||||||||||||