[PATCH] Fix #else in docprobe

Martin Michlmayr tbm at cyrius.com
Sun Feb 19 19:06:06 EST 2006


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 at cyrius.com>

--- linux-2.6.16-rc4/drivers/mtd/devices/docprobe.c	2006-02-19 20:09:05.000000000 +0000
+++ mips-2.6.16-rc4/drivers/mtd/devices/docprobe.c	2006-02-19 20:15:19.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 };

-- 
MartinnMichlmayr
http://www.cyrius.com/




More information about the linux-mtd mailing list