Merge ../linus

[linux-2.6] / 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 bbcd4335f44196ea518d6c484a8c0254531cd91b..17bc9409748137dd6eabadad84a2b235f19d56b2 100644 (file)
--- a/include/asm-arm/arch-lh7a40x/io.h
+++ b/include/asm-arm/arch-lh7a40x/io.h
@@ -18,6 +18,5 @@
 /* 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 */