Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / common.c

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 20e8db5fe32a58cc22156b737d4079e321bb3966..0843b8882f9311aa38dd972537dd5f5f757e86e7 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -18,12 +18,12 @@
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
-#include <asm/io.h>
 #include <asm/setup.h>
 
 #include <mach/common.h>
@@ -248,6 +248,7 @@ static struct omap_globals *omap2_globals;
 
 static void __init __omap2_set_globals(void)
 {
+       omap2_set_globals_tap(omap2_globals);
        omap2_set_globals_memory(omap2_globals);
        omap2_set_globals_control(omap2_globals);
        omap2_set_globals_prcm(omap2_globals);
@@ -258,6 +259,7 @@ static void __init __omap2_set_globals(void)
 #if defined(CONFIG_ARCH_OMAP2420)
 
 static struct omap_globals omap242x_globals = {
+       .class  = OMAP242X_CLASS,
        .tap    = OMAP2_IO_ADDRESS(0x48014000),
        .sdrc   = OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE),
        .sms    = OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE),
@@ -276,6 +278,7 @@ void __init omap2_set_globals_242x(void)
 #if defined(CONFIG_ARCH_OMAP2430)
 
 static struct omap_globals omap243x_globals = {
+       .class  = OMAP243X_CLASS,
        .tap    = OMAP2_IO_ADDRESS(0x4900a000),
        .sdrc   = OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE),
        .sms    = OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE),
@@ -294,6 +297,7 @@ void __init omap2_set_globals_243x(void)
 #if defined(CONFIG_ARCH_OMAP3430)
 
 static struct omap_globals omap343x_globals = {
+       .class  = OMAP343X_CLASS,
        .tap    = OMAP2_IO_ADDRESS(0x4830A000),
        .sdrc   = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
        .sms    = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),