Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / asm-arm / arch-versatile / io.h

diff --git a/include/asm-arm/arch-versatile/io.h b/include/asm-arm/arch-versatile/io.h
index c2eed7f04b78f6d604061351d7cc09dc26277143..c4d01948e00bccd8a25ac33693c50c9910d67e29 100644 (file)
--- a/include/asm-arm/arch-versatile/io.h
+++ b/include/asm-arm/arch-versatile/io.h
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <asm/hardware.h>
-
 #define IO_SPACE_LIMIT 0xffffffff
 
 static inline void __iomem *__io(unsigned long addr)
@@ -30,6 +28,5 @@ static inline void __iomem *__io(unsigned long addr)
 }
 #define __io(a)        __io(a)
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif