diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-14 00:01:18 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-14 00:01:18 -0400 |
| commit | 2bc856c419d9941589ff210900a60906d773f1c4 (patch) | |
| tree | 6b6a034d2d61c4b0f0f3bb59c673dd7b16d19c11 /arch/arm/mach-tegra | |
| parent | 13d0dff8937f911a0812f95871873288e14c56e2 (diff) | |
| parent | a2a47ca36642e3995e982957bc42678cf11ca6ac (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into devel/io-cleanup
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/iomap.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h index 082b4d167801..c05b311ee4f7 100644 --- a/arch/arm/mach-tegra/include/mach/iomap.h +++ b/arch/arm/mach-tegra/include/mach/iomap.h | |||
| @@ -281,12 +281,6 @@ | |||
| 281 | * | 281 | * |
| 282 | */ | 282 | */ |
| 283 | 283 | ||
| 284 | #ifdef __ASSEMBLY__ | ||
| 285 | #define IOMEM(x) (x) | ||
| 286 | #else | ||
| 287 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
| 288 | #endif | ||
| 289 | |||
| 290 | #define IO_IRAM_PHYS 0x40000000 | 284 | #define IO_IRAM_PHYS 0x40000000 |
| 291 | #define IO_IRAM_VIRT IOMEM(0xFE400000) | 285 | #define IO_IRAM_VIRT IOMEM(0xFE400000) |
| 292 | #define IO_IRAM_SIZE SZ_256K | 286 | #define IO_IRAM_SIZE SZ_256K |