Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / arch / arm / mach-pxa / trizeps4.c

diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index bdb02a0ae1b7be320c2c93f3d8954da5ab7809aa..423261d63d073213c5ca0f4d01e5fa25e237f2f1 100644 (file)
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -46,6 +46,7 @@
 #include <mach/mmc.h>
 #include <mach/irda.h>
 #include <mach/ohci.h>
+#include <mach/smemc.h>
 #include <plat/i2c.h>
 
 #include "generic.h"
@@ -538,10 +539,10 @@ static void __init trizeps4_init(void)
 
 static void __init trizeps4_map_io(void)
 {
-       pxa_map_io();
+       pxa27x_map_io();
        iotable_init(trizeps4_io_desc, ARRAY_SIZE(trizeps4_io_desc));
 
-       if ((MSC0 & 0x8) && (BOOT_DEF & 0x1)) {
+       if ((__raw_readl(MSC0) & 0x8) && (__raw_readl(BOOT_DEF) & 0x1)) {
                /* if flash is 16 bit wide its a Trizeps4 WL */
                __machine_arch_type = MACH_TYPE_TRIZEPS4WL;
                trizeps4_flash_data[0].width = 2;