tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / arch / arm / mach-pxa / gumstix.c

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index e296ce1..96c3451 100644 (file)
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -38,14 +38,12 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
+
+#include <mach/pxa25x.h>
 #include <mach/mmc.h>
 #include <mach/udc.h>
 #include <mach/gumstix.h>
 
-#include <mach/pxa-regs.h>
-#include <mach/pxa2xx-regs.h>
-#include <mach/mfp-pxa25x.h>
-
 #include "generic.h"
 
 static struct resource flash_resource = {
@@ -90,7 +88,10 @@ static struct platform_device *devices[] __initdata = {
 
 #ifdef CONFIG_MMC_PXA
 static struct pxamci_platform_data gumstix_mci_platform_data = {
-       .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+       .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
+       .gpio_card_detect       = -1,
+       .gpio_card_ro           = -1,
+       .gpio_power             = -1,
 };
 
 static void __init gumstix_mmc_init(void)
@@ -191,6 +192,11 @@ int __attribute__((weak)) am200_init(void)
        return 0;
 }
 
+int __attribute__((weak)) am300_init(void)
+{
+       return 0;
+}
+
 static void __init carrier_board_init(void)
 {
        /*
@@ -198,12 +204,18 @@ static void __init carrier_board_init(void)
         * they cannot be detected programatically
         */
        am200_init();
+       am300_init();
 }
 
 static void __init gumstix_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
 
+       pxa_set_ffuart_info(NULL);
+       pxa_set_btuart_info(NULL);
+       pxa_set_stuart_info(NULL);
+       pxa_set_hwuart_info(NULL);
+
        gumstix_bluetooth_init();
        gumstix_udc_init();
        gumstix_mmc_init();