Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-aaec2000 / io.h

diff --git a/include/asm-arm/arch-aaec2000/io.h b/include/asm-arm/arch-aaec2000/io.h
index c58a8d10425a3f8304cb9fbe854cde84b52cd2d6..d710204ac7479607c4899cf32722e7786b8c86ae 100644 (file)
--- a/include/asm-arm/arch-aaec2000/io.h
+++ b/include/asm-arm/arch-aaec2000/io.h
@@ -6,6 +6,8 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
+#include <asm/hardware.h>
+
 #define IO_SPACE_LIMIT 0xffffffff
 
 /*
@@ -14,6 +16,5 @@
  */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif