Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 15 insertions, 7 deletions

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index d8962a0fb98d..e296ce11658c 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -184,15 +184,22 @@ static unsigned long gumstix_pin_config[] __initdata = {
         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));
@@ -201,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")