From: Martin Michlmayr <tbm@cyrius.com>
To: akpm@osdl.org
Cc: linux-mips@linux-mips.org, linux-mtd@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 9/12] [MTD] Fix #else directive in the docprobe driver
Date: Mon, 20 Mar 2006 04:40:36 +0000 [thread overview]
Message-ID: <20060320044036.GI20416@deprecation.cyrius.com> (raw)
In-Reply-To: <20060320043802.GA20389@deprecation.cyrius.com>
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/
next prev parent reply other threads:[~2006-03-20 4:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060320043802.GA20389@deprecation.cyrius.com>
2006-03-20 4:40 ` [PATCH 8/12] [MTD] Re-add module description for ms02-nv to Kconfig Martin Michlmayr
2006-03-20 4:40 ` Martin Michlmayr [this message]
2006-03-20 4:40 ` [PATCH 10/12] [MTD] LASAT depends on MTD_CFI Martin Michlmayr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060320044036.GI20416@deprecation.cyrius.com \
--to=tbm@cyrius.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox