Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[pandora-kernel.git] / arch / arm / mach-rpc / include / mach / memory.h

diff --git a/arch/arm/mach-rpc/include/mach/memory.h b/arch/arm/mach-rpc/include/mach/memory.h
index 9bf7e43..18a2210 100644 (file)
--- a/arch/arm/mach-rpc/include/mach/memory.h
+++ b/arch/arm/mach-rpc/include/mach/memory.h
@@ -21,14 +21,7 @@
 /*
  * Physical DRAM offset.
  */
-#define PHYS_OFFSET    UL(0x10000000)
-
-/*
- * These are exactly the same on the RiscPC as the
- * physical memory view.
- */
-#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt(x) __phys_to_virt(x)
+#define PLAT_PHYS_OFFSET       UL(0x10000000)
 
 /*
  * Cache flushing area - ROM