summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-iop32x/io.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-08 03:37:51 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-05-08 03:37:51 (GMT)
commit02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch)
tree04ef573cd4de095c500c9fc3477f4278c0b36300 /include/asm-arm/arch-iop32x/io.h
parent7487a2245b8841c77ba9db406cf99a483b9334e9 (diff)
parent5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff)
downloadlinux-fsl-qoriq-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-arm/arch-iop32x/io.h')
-rw-r--r--include/asm-arm/arch-iop32x/io.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop32x/io.h b/include/asm-arm/arch-iop32x/io.h
index 5f570a5..994f16a 100644
--- a/include/asm-arm/arch-iop32x/io.h
+++ b/include/asm-arm/arch-iop32x/io.h
@@ -13,7 +13,6 @@
#include <asm/hardware.h>
-extern void __iomem * __ioremap(unsigned long, size_t, unsigned long);
extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
unsigned long flags);
extern void __iop3xx_iounmap(void __iomem *addr);