summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/setup.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 09:12:24 +0400
committerOlof Johansson <olof@lixom.net>2011-12-20 09:13:41 +0400
commit844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch)
treefdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mach-at91/setup.c
parent5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff)
parenta53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff)
downloadlinux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits) MAINTAINERS: add maintainer entry for Picochip picoxcell ARM: picoxcell: move io mappings to common.c ARM: picoxcell: don't reserve irq_descs ARM: picoxcell: remove mach/memory.h Conflicts: arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r--arch/arm/mach-at91/setup.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 242c26b2368d..8bdcc3cb6012 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -75,24 +75,6 @@ static struct map_desc at91_io_desc __initdata = {
.type = MT_DEVICE,
};
-void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
-{
- if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
- return (void __iomem *)AT91_IO_P2V(p);
-
- return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
-}
-EXPORT_SYMBOL(at91_ioremap);
-
-void at91_iounmap(volatile void __iomem *addr)
-{
- unsigned long virt = (unsigned long)addr;
-
- if (virt >= VMALLOC_START && virt < VMALLOC_END)
- __iounmap(addr);
-}
-EXPORT_SYMBOL(at91_iounmap);
-
static void __init soc_detect(u32 dbgu_base)
{
u32 cidr, socid;