Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ebsa110 / include / mach / memory.h

diff --git a/arch/arm/mach-ebsa110/include/mach/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h
index eea4b75b657bb730cf978e633a0d1ef395c33d48..0ca66d080c6959245c3c0f38e574f849bbf41b73 100644 (file)
--- a/arch/arm/mach-ebsa110/include/mach/memory.h
+++ b/arch/arm/mach-ebsa110/include/mach/memory.h
@@ -21,13 +21,6 @@
  */
 #define PHYS_OFFSET    UL(0x00000000)
 
-/*
- * We keep this 1:1 so that we don't interfere
- * with the PCMCIA memory regions
- */
-#define __virt_to_bus(x)       (x)
-#define __bus_to_virt(x)       (x)
-
 /*
  * Cache flushing area - SRAM
  */