Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / gumstix.c

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index e296ce11658c48633aae5c696fbcaab1355e9ec2..ca9912ea78d93207962b34fc866140ba80d779e8 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 = {
@@ -191,6 +189,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,6 +201,7 @@ static void __init carrier_board_init(void)
         * they cannot be detected programatically
         */
        am200_init();
+       am300_init();
 }
 
 static void __init gumstix_init(void)