diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/include/plat/hardware.h | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/sdrc.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-omap/include/plat/hardware.h index 537b05ae1f51..e897978371c2 100644 --- a/arch/arm/plat-omap/include/plat/hardware.h +++ b/arch/arm/plat-omap/include/plat/hardware.h | |||
@@ -43,12 +43,6 @@ | |||
43 | #endif | 43 | #endif |
44 | #include <plat/serial.h> | 44 | #include <plat/serial.h> |
45 | 45 | ||
46 | #ifdef __ASSEMBLER__ | ||
47 | #define IOMEM(x) (x) | ||
48 | #else | ||
49 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
50 | #endif | ||
51 | |||
52 | /* | 46 | /* |
53 | * --------------------------------------------------------------------------- | 47 | * --------------------------------------------------------------------------- |
54 | * Common definitions for all OMAP processors | 48 | * Common definitions for all OMAP processors |
diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h index 925b12b500dc..9bb978ecd884 100644 --- a/arch/arm/plat-omap/include/plat/sdrc.h +++ b/arch/arm/plat-omap/include/plat/sdrc.h | |||
@@ -16,7 +16,6 @@ | |||
16 | * published by the Free Software Foundation. | 16 | * published by the Free Software Foundation. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <mach/io.h> | ||
20 | 19 | ||
21 | /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */ | 20 | /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */ |
22 | 21 | ||
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index d0fc9f4dc155..762eeb0626c1 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h | |||
@@ -112,7 +112,6 @@ extern int omap4430_phy_suspend(struct device *dev, int suspend); | |||
112 | */ | 112 | */ |
113 | 113 | ||
114 | #define OMAP2_L4_IO_OFFSET 0xb2000000 | 114 | #define OMAP2_L4_IO_OFFSET 0xb2000000 |
115 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
116 | #define OMAP2_L4_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L4_IO_OFFSET) | 115 | #define OMAP2_L4_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L4_IO_OFFSET) |
117 | 116 | ||
118 | static inline u8 omap_readb(u32 pa) | 117 | static inline u8 omap_readb(u32 pa) |