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

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

diff --git a/include/asm-arm/arch-pxa/io.h b/include/asm-arm/arch-pxa/io.h
index eb2dd58d397fa187690093a618afcf49c83f7221..7f8d817b446f8daf404c74674446ec0748675a05 100644 (file)
--- a/include/asm-arm/arch-pxa/io.h
+++ b/include/asm-arm/arch-pxa/io.h
@@ -16,6 +16,5 @@
  */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif