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

Conflicts:

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

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 06bc6674b015..e296ce11658c 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -186,6 +186,20 @@ static unsigned long gumstix_pin_config[] __initdata = {
         GPIO8_MMC_CS0,
 };
 
+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));
@@ -194,6 +208,7 @@ static void __init gumstix_init(void)
         gumstix_udc_init();
         gumstix_mmc_init();
         (void) platform_add_devices(devices, ARRAY_SIZE(devices));
+        carrier_board_init();
 }
 
 MACHINE_START(GUMSTIX, "Gumstix")