Re: [PATCH] colibri.h: Fix building for colibri 270...

[Daniel Mack <daniel@caiaq.de>]

On Fri, Apr 16, 2010 at 11:51:10AM +0200, Jakob Viketoft wrote:
> The recent addition of (Colibri) PXA3xx specific declarations breaks
> the building of the Colibri 270 with similar features.

Hmm, I can't see any problem here. Which error did you get? Which boards
did you select in your config?

Daniel


> 
> 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 */
>