diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:59 +0100 |
| commit | 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch) | |
| tree | 4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/plat-omap/include | |
| parent | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/... (diff) | |
| parent | ARM: move VMALLOC_END down temporarily for shmobile (diff) | |
| download | linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.zip | |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index 62f4477666cb..1234944a4da0 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -247,8 +247,6 @@ * NOTE: Please use ioremap + __raw_read/write where possible instead of these */ -void omap_ioremap_init(void); - extern u8 omap_readb(u32 pa); extern u16 omap_readw(u32 pa); extern u32 omap_readl(u32 pa); @@ -260,12 +258,6 @@ struct omap_sdrc_params; extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); -#define __arch_ioremap omap_ioremap -#define __arch_iounmap omap_iounmap - -void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type); -void omap_iounmap(volatile void __iomem *addr); - extern void __init omap_init_consistent_dma_size(void); #endif |