linux-mips
[Top] [All Lists]

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

To: akpm@osdl.org
Subject: [PATCH 9/12] [MTD] Fix #else directive in the docprobe driver
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 20 Mar 2006 04:40:36 +0000
Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, linux-mtd@lists.infradead.org
In-reply-to: <20060320043802.GA20389@deprecation.cyrius.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060320043802.GA20389@deprecation.cyrius.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.11+cvs20060126
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/

<Prev in Thread] Current Thread [Next in Thread>