summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop32x
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 03:27:54 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 03:27:59 +0400
commit73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch)
tree4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-iop32x
parent742eaa6a6e356a16788ce6530271de89bc4f8fb5 (diff)
parent0af362f8440a78b970d5f215e234420fa87d0f3f (diff)
downloadlinux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-iop32x')
-rw-r--r--arch/arm/mach-iop32x/include/mach/io.h7
-rw-r--r--arch/arm/mach-iop32x/include/mach/vmalloc.h5
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h
index 059c783ce0b2..2d88264b9863 100644
--- a/arch/arm/mach-iop32x/include/mach/io.h
+++ b/arch/arm/mach-iop32x/include/mach/io.h
@@ -13,15 +13,8 @@
#include <asm/hardware/iop3xx.h>
-extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
- unsigned int mtype);
-extern void __iop3xx_iounmap(void __iomem *addr);
-
#define IO_SPACE_LIMIT 0xffffffff
#define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))
#define __mem_pci(a) (a)
-#define __arch_ioremap __iop3xx_ioremap
-#define __arch_iounmap __iop3xx_iounmap
-
#endif
diff --git a/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h
deleted file mode 100644
index c4862d48e583..000000000000
--- a/arch/arm/mach-iop32x/include/mach/vmalloc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-iop32x/include/mach/vmalloc.h
- */
-
-#define VMALLOC_END 0xfe000000UL