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

[linux-2.6] / include / asm-arm / arch-h720x / memory.h

diff --git a/include/asm-arm/arch-h720x/memory.h b/include/asm-arm/arch-h720x/memory.h
index 5633447af26806f4d211a518ec7e19cc9103c2f1..53e923dba76e658b4d4613e8099ae424c2ce2854 100644 (file)
--- a/include/asm-arm/arch-h720x/memory.h
+++ b/include/asm-arm/arch-h720x/memory.h
@@ -11,7 +11,7 @@
  * Page offset:
  *    ( 0xc0000000UL )
  */
-#define PHYS_OFFSET    (0x40000000UL)
+#define PHYS_OFFSET    UL(0x40000000)
 
 /*
  * Virtual view <-> DMA view memory address translations
@@ -23,9 +23,7 @@
  * There is something to do here later !, Mar 2000, Jungjun Kim
  */
 
-#define __virt_to_bus__is_a_macro
 #define __virt_to_bus(x)       __virt_to_phys(x)
-#define __bus_to_virt__is_a_macro
 #define __bus_to_virt(x)       __phys_to_virt(x)
 
 #endif