X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Farm%2Fmach-at91%2Finclude%2Fmach%2Fio.h;h=4298e7806c766efcde674ce92a97b26499516454;hp=1611bd03f52892ca846f56f4adc8801e4c85e362;hb=fb149f9e2835446e02e796081635520b881dc351;hpb=e496e3d645c93206faf61ff6005995ebd08cc39c

diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h
index 1611bd03f528..4298e7806c76 100644
--- a/arch/arm/mach-at91/include/mach/io.h
+++ b/arch/arm/mach-at91/include/mach/io.h
@@ -21,14 +21,23 @@
 #ifndef __ASM_ARCH_IO_H
 #define __ASM_ARCH_IO_H
 
-#define IO_SPACE_LIMIT		0xFFFFFFFF
+#include <mach/hardware.h>
 
-#define __io(a)			((void __iomem *)(a))
-#define __mem_pci(a)		(a)
+#define IO_SPACE_LIMIT		0xFFFFFFFF
 
+#define __io(a)		__typesafe_io(a)
+#define __mem_pci(a)	(a)
 
 #ifndef __ASSEMBLY__
 
+#ifndef CONFIG_ARCH_AT91X40
+#define __arch_ioremap	at91_ioremap
+#define __arch_iounmap	at91_iounmap
+#endif
+
+void __iomem *at91_ioremap(unsigned long phys, size_t size, unsigned int type);
+void at91_iounmap(volatile void __iomem *addr);
+
 static inline unsigned int at91_sys_read(unsigned int reg_offset)
 {
 	void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;