Merge branch 's3c-iis-header' into for-2.6.30

Conflicts:
	arch/arm/mach-shark/include/mach/io.h

2 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c2410/include/mach/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h
index db72beb61d7c..74d5a1a4024c 100644
--- a/arch/arm/mach-s3c2410/include/mach/hardware.h
+++ b/arch/arm/mach-s3c2410/include/mach/hardware.h
@@ -131,4 +131,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
 
 /* machine specific hardware definitions should go after this */
 
+/* currently here until moved into config (todo) */
+#define CONFIG_NO_MULTIWORD_IO
+
 #endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h
index 568daea93fb1..c5cee829fc87 100644
--- a/arch/arm/mach-shark/include/mach/io.h
+++ b/arch/arm/mach-shark/include/mach/io.h
@@ -14,8 +14,7 @@
 #define PCIO_BASE       0xe0000000
 #define IO_SPACE_LIMIT  0xffffffff
 
-#define __io(a)         __typesafe_io(PCIO_BASE + (a))
-
+#define __io(a)         ((void __iomem *)(PCIO_BASE + (a)))
 #define __mem_pci(addr) (addr)
 
 #endif