[PATCH 9/12] [MTD] Fix #else directive in the docprobe driver

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 <[email protected]>


--- 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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • Bring mainline in sync with the linux-mips tree
    • From: Martin Michlmayr <[email protected]>

• Prev by Date: [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree
• Next by Date: Re: Why doesn't MGEODE_LX enable X86_TSC?
• Previous by thread: [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree
• Next by thread: [0/3] Kprobes: User space probes support
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]