From: Jakob Viketoft <jakob.viketoft@bitsim.com>
To: linux-kernel@vger.kernel.org
Cc: Daniel Mack <daniel@caiaq.de>, Eric Miao <eric.y.miao@gmail.com>
Subject: [PATCH] colibri.h: Fix building for colibri 270...
Date: Fri, 16 Apr 2010 11:51:10 +0200 [thread overview]
Message-ID: <4BC8330E.6000503@bitsim.com> (raw)
The recent addition of (Colibri) PXA3xx specific declarations breaks the
building of the Colibri 270 with similar features.
CC: Daniel Mack <daniel@caiaq.de>
CC: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by <jakob.viketoft@bitsim.com>
--- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
17:09:39.000000000 +0100
+++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
11:06:15.000000000 +0200
@@ -7,6 +7,7 @@
* common settings for all modules
*/
+#if defined(CONFIG_MACH_COLIBRI300) || defined(CONFIG_MACH_COLIBRI320)
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int
detect_pin);
#else
@@ -28,6 +29,7 @@
#else
static inline void colibri_pxa3xx_init_nand(void) {}
#endif
+#endif
/* physical memory regions */
#define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
next reply other threads:[~2010-04-16 9:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-16 9:51 Jakob Viketoft [this message]
2010-04-16 10:01 ` [PATCH] colibri.h: Fix building for colibri 270 Daniel Mack
2010-04-16 11:17 ` Jakob Viketoft
2010-04-16 11:25 ` Jakob Viketoft
2010-04-16 11:28 ` Daniel Mack
2010-04-16 11:29 ` Daniel Mack
2010-05-05 7:45 ` Eric Miao
2010-05-05 8:00 ` Daniel Mack
2010-05-05 9:28 ` Eric Miao
2010-05-05 9:44 ` Daniel Mack
2010-05-05 9:47 ` Eric Miao
2010-05-05 9:53 ` Daniel Mack
2010-05-05 10:21 ` Eric Miao
2010-05-05 11:02 ` Jakob Viketoft
2010-05-05 15:20 ` Greg KH
2010-05-05 15:54 ` Daniel Mack
2010-05-05 16:15 ` Greg KH
2010-04-16 11:26 ` Daniel Mack
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=4BC8330E.6000503@bitsim.com \
--to=jakob.viketoft@bitsim.com \
--cc=daniel@caiaq.de \
--cc=eric.y.miao@gmail.com \
--cc=linux-kernel@vger.kernel.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