Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h
index a325caf80d04b9a18928a7b6478a64ab4f5338e3..2d80fa2639e1a703c6969dd63ffbb091ec3af3c3 100644 (file)
--- a/arch/arm/plat-omap/include/mach/memory.h
+++ b/arch/arm/plat-omap/include/mach/memory.h
@@ -6,7 +6,7 @@
  * Copyright (C) 2000 RidgeRun, Inc.
  * Author: Greg Lonnon <glonnon@ridgerun.com>
  *
- * This file was derived from arch/arm/mach-intergrator/include/mach/memory.h
+ * This file was derived from linux/include/asm-arm/arch-intergrator/memory.h
  * Copyright (C) 1999 ARM Limited
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  */
 #if defined(CONFIG_ARCH_OMAP1)
 #define PHYS_OFFSET            UL(0x10000000)
-#elif defined(CONFIG_ARCH_OMAP2)
+#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #define PHYS_OFFSET            UL(0x80000000)
 #endif