aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 11:02:33 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 11:10:19 +0000
commita2b03461cb072eb6097a55ec0289294b09382284 (patch)
treef314b5d0bbfca5b47b89732efe0c3dedbc38bcb8 /arch/arm
parent899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc (diff)
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/hardware.h3
-rw-r--r--arch/arm/mach-shark/include/mach/io.h2
2 files changed, 4 insertions, 1 deletions
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