diff options
Diffstat (limited to 'arch/arm/mach-msm/include/mach/msm_iomap-7x00.h')
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h index 8af46123dab6..6c4046c21296 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | |||
@@ -38,12 +38,6 @@ | |||
38 | * | 38 | * |
39 | */ | 39 | */ |
40 | 40 | ||
41 | #ifdef __ASSEMBLY__ | ||
42 | #define IOMEM(x) x | ||
43 | #else | ||
44 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
45 | #endif | ||
46 | |||
47 | #define MSM_VIC_BASE IOMEM(0xE0000000) | 41 | #define MSM_VIC_BASE IOMEM(0xE0000000) |
48 | #define MSM_VIC_PHYS 0xC0000000 | 42 | #define MSM_VIC_PHYS 0xC0000000 |
49 | #define MSM_VIC_SIZE SZ_4K | 43 | #define MSM_VIC_SIZE SZ_4K |
@@ -111,5 +105,11 @@ | |||
111 | #define MSM_AD5_PHYS 0xAC000000 | 105 | #define MSM_AD5_PHYS 0xAC000000 |
112 | #define MSM_AD5_SIZE (SZ_1M*13) | 106 | #define MSM_AD5_SIZE (SZ_1M*13) |
113 | 107 | ||
108 | #ifndef __ASSEMBLY__ | ||
109 | |||
110 | extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, | ||
111 | unsigned int mtype, void *caller); | ||
112 | |||
113 | #endif | ||
114 | 114 | ||
115 | #endif | 115 | #endif |