]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] Revert extraneous changes from the S3C audio header move
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 11 Mar 2009 11:02:33 +0000 (11:02 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 11 Mar 2009 11:10:19 +0000 (11:10 +0000)
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>
arch/arm/mach-s3c2410/include/mach/hardware.h
arch/arm/mach-shark/include/mach/io.h

index db72beb61d7c98bf0219bbbadfab22e8ca272d3b..74d5a1a4024cece53810ef96e25236de0b64a883 100644 (file)
@@ -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 */
index 8ca7d7f09bdc383ca418812ec6324bc8ab2fe58b..c5cee829fc87e59dd402e797f1242451b248c9a0 100644 (file)
@@ -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