From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 11 Mar 2009 11:02:33 +0000 (+0000)
Subject: [ARM] Revert extraneous changes from the S3C audio header move
X-Git-Tag: v2.6.30-rc1~8^2~38^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a2b03461cb072eb6097a55ec0289294b09382284;p=~emulex%2Finfiniband.git

[ARM] Revert extraneous changes from the S3C audio header move

These changes were included in the S3C audio header move but are not
directly related to it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/arch/arm/mach-s3c2410/include/mach/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h
index db72beb61d7..74d5a1a4024 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 8ca7d7f09bd..c5cee829fc8 100644
--- a/arch/arm/mach-shark/include/mach/io.h
+++ b/arch/arm/mach-shark/include/mach/io.h
@@ -14,7 +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