Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[mv-sheeva.git] / include / asm-arm / arch-lh7a40x / io.h

diff --git a/include/asm-arm/arch-lh7a40x/io.h b/include/asm-arm/arch-lh7a40x/io.h
index c13bdd9add926453f510c3ee1a323a7559e34b15..17bc9409748137dd6eabadad84a2b235f19d56b2 100644 (file)
--- a/include/asm-arm/arch-lh7a40x/io.h
+++ b/include/asm-arm/arch-lh7a40x/io.h
@@ -11,11 +11,12 @@
 #ifndef __ASM_ARCH_IO_H
 #define __ASM_ARCH_IO_H
 
+#include <asm/hardware.h>
+
 #define IO_SPACE_LIMIT 0xffffffff
 
 /* No ISA or PCI bus on this machine. */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif /* __ASM_ARCH_IO_H */