Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

Conflicts:

	arch/arm/mach-pxa/am200epd.c
	arch/arm/mach-pxa/ezx.c

diff --cc arch/arm/mach-pxa/Kconfig
Simple merge

diff --cc arch/arm/mach-pxa/am200epd.c
index 3a4f8d8,fd61420..77ee80e
--- 1/arch/arm/mach-pxa/am200epd.c
--- 2/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@@ -335,16 -331,7 +335,16 @@@ static struct metronome_board am200_boa
        .cleanup                = am200_cleanup,
  };
  
- static int __init am200_init(void)
 +static unsigned long am200_pin_config[] __initdata = {
 +      GPIO51_GPIO,
 +      GPIO49_GPIO,
 +      GPIO48_GPIO,
 +      GPIO32_GPIO,
 +      GPIO17_GPIO,
 +      GPIO16_GPIO,
 +};
 +
+ int __init am200_init(void)
  {
        int ret;
  

diff --cc arch/arm/mach-pxa/e400.c
Simple merge

diff --cc arch/arm/mach-pxa/ezx.c
index 3e6aa33,4f212e1..df5f822
--- 1/arch/arm/mach-pxa/ezx.c
--- 2/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@@ -21,7 -22,7 +22,8 @@@
  #include <mach/pxafb.h>
  #include <mach/ohci.h>
  #include <mach/i2c.h>
 +#include <mach/hardware.h>
+ #include <mach/pxa27x_keypad.h>
  
  #include <mach/mfp-pxa27x.h>
  #include <mach/pxa-regs.h>

diff --cc arch/arm/mach-pxa/gumstix.c
index 06bc667,14d5103..e296ce1
--- 1/arch/arm/mach-pxa/gumstix.c
--- 2/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@@ -184,8 -184,29 +184,22 @@@ static unsigned long gumstix_pin_config
        GPIO6_MMC_CLK,
        GPIO53_MMC_CLK,
        GPIO8_MMC_CS0,
 -      /* these are used by AM200EPD */
 -      GPIO51_GPIO,
 -      GPIO49_GPIO,
 -      GPIO48_GPIO,
 -      GPIO32_GPIO,
 -      GPIO17_GPIO,
 -      GPIO16_GPIO,
  };
  
+ int __attribute__((weak)) am200_init(void)
+ {
+       return 0;
+ }
+ 
+ static void __init carrier_board_init(void)
+ {
+       /*
+        * put carrier/expansion board init here if
+        * they cannot be detected programatically
+        */
+       am200_init();
+ }
+ 
  static void __init gumstix_init(void)
  {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));

diff --cc arch/arm/mach-pxa/pcm990-baseboard.c
Simple merge

diff --cc drivers/video/pxafb.c
Simple merge