Prev: io-controller: including "linux/sched.h"
Next: [PATCH 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq()
From: Jakob Viketoft on 16 Apr 2010 06:00
The recent addition of (Colibri) PXA3xx specific declarations breaks the
building of the Colibri 270 with similar features.

CC: Daniel Mack <daniel(a)caiaq.de>
CC: Eric Miao <eric.y.miao(a)gmail.com>
Signed-off-by <jakob.viketoft(a)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 */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: io-controller: including "linux/sched.h"
Next: [PATCH 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq()