diff options
| author | Mark Brown | 2009-03-11 11:12:48 +0000 |
|---|---|---|
| committer | Mark Brown | 2009-03-11 11:12:48 +0000 |
| commit | 3c081384007332ab95c8d8753f47719d6646bcb2 (patch) | |
| tree | 0c3f2029c3033d5923cf8b8c86c7b4302f44262d | |
| parent | f455dfb106916d855d59686fe16575c2ceb2cb2a (diff) | |
| parent | a2b03461cb072eb6097a55ec0289294b09382284 (diff) | |
Merge branch 's3c-iis-header' into for-2.6.30
Conflicts:
arch/arm/mach-shark/include/mach/io.h
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/hardware.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/io.h | 3 |
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 |