Merge branch 'master' into upstream

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

diff --git a/include/asm-arm/arch-pxa/memory.h b/include/asm-arm/arch-pxa/memory.h
index 58bad9748b5c4075400b297ca2a13bfd74a89b50..eaf6d43939e9ef74cf9ab371ee7f9f6d186b8e83 100644 (file)
--- a/include/asm-arm/arch-pxa/memory.h
+++ b/include/asm-arm/arch-pxa/memory.h
@@ -15,7 +15,7 @@
 /*
  * Physical DRAM offset.
  */
-#define PHYS_OFFSET    (0xa0000000UL)
+#define PHYS_OFFSET    UL(0xa0000000)
 
 /*
  * Virtual view <-> DMA view memory address translations