From 78cbd4642d7cdb067f968024b10d1412e8b53ac6 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Tue, 5 Jul 2011 22:52:53 -0400
Subject: [PATCH] --- yaml --- r: 270191 b: refs/heads/master c:
 b890f6b59d1210c682b310a28dabd134674b81e0 h: refs/heads/master i:   270189:
 9eb804ea512f52948773b1b32a5a2cae422d80a5   270187:
 d7dcf42848046fba979cd48b51b9e247abbd03bd   270183:
 f262585a95fc06af0ec6219ab1beb4e55f99ba79   270175:
 d05d2148efdb6d511a9a6c770329f5e194538097 v: v3

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

diff --git a/[refs] b/[refs]
index f692f934eac5..2bfcdf3c9dc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f29781ac69c913272acf915c4d3aacc44af5ddfc
+refs/heads/master: b890f6b59d1210c682b310a28dabd134674b81e0
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index ecc18d51f332..dd72287cb29c 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -627,6 +627,7 @@ config ARCH_PNX4008
 	select CPU_ARM926T
 	select CLKDEV_LOOKUP
 	select ARCH_USES_GETTIMEOFFSET
+	select NO_MACH_MEMORY_H
 	help
 	  This enables support for Philips PNX4008 mobile platform.
 
diff --git a/trunk/arch/arm/mach-pnx4008/include/mach/memory.h b/trunk/arch/arm/mach-pnx4008/include/mach/memory.h
deleted file mode 100644
index 1275db61cee5..000000000000
--- a/trunk/arch/arm/mach-pnx4008/include/mach/memory.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-pnx4008/include/mach/memory.h
- *
- * Copyright (c) 2005 Philips Semiconductors
- * Copyright (c) 2005 MontaVista Software, Inc.
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET	UL(0x80000000)
-
-#endif