From f262585a95fc06af0ec6219ab1beb4e55f99ba79 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Tue, 5 Jul 2011 22:52:52 -0400
Subject: [PATCH] --- yaml --- r: 270183 b: refs/heads/master c:
 8fce8b2080bf49de9e5d96161932edcbffad11cf h: refs/heads/master i:   270181:
 d9cda0d99c11b8b57205b3cf9b29b74001713bf5   270179:
 8167616bb91b8776cf4a90186c8bff9ed06f974b   270175:
 d05d2148efdb6d511a9a6c770329f5e194538097 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/arm/Kconfig                            |  1 +
 trunk/arch/arm/mach-orion5x/include/mach/memory.h | 12 ------------
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-orion5x/include/mach/memory.h

diff --git a/[refs] b/[refs]
index 0e2b3147db78..46dc186aa664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 748e91cb3c6040a73b63afc348fe3d6042bdeef3
+refs/heads/master: 8fce8b2080bf49de9e5d96161932edcbffad11cf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index b2235184e7b6..465bdb25ac13 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -552,6 +552,7 @@ config ARCH_ORION5X
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
 	select PLAT_ORION
+	select NO_MACH_MEMORY_H
 	help
 	  Support for the following Marvell Orion 5x series SoCs:
 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
diff --git a/trunk/arch/arm/mach-orion5x/include/mach/memory.h b/trunk/arch/arm/mach-orion5x/include/mach/memory.h
deleted file mode 100644
index 6769917882fe..000000000000
--- a/trunk/arch/arm/mach-orion5x/include/mach/memory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/arm/mach-orion5x/include/mach/memory.h
- *
- * Marvell Orion memory definitions
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET	UL(0x00000000)
-
-#endif