From f21ee340e62daea97e1149ee41c62083ea01431c Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Tue, 5 Jul 2011 22:52:54 -0400
Subject: [PATCH] --- yaml --- r: 270194 b: refs/heads/master c:
 6d3f8b40f4b6b832491617be510970157264513a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7f398d4d99d6..a90b999acf84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b0e7f69ad24613c09a1bb6632d448885cf7b034
+refs/heads/master: 6d3f8b40f4b6b832491617be510970157264513a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 57d805e9e241..96531afb8fb7 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -863,6 +863,7 @@ config ARCH_U8500
 	select CLKDEV_LOOKUP
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_CPUFREQ
+	select NO_MACH_MEMORY_H
 	help
 	  Support for ST-Ericsson's Ux500 architecture
 
diff --git a/trunk/arch/arm/mach-ux500/include/mach/memory.h b/trunk/arch/arm/mach-ux500/include/mach/memory.h
deleted file mode 100644
index 2ef697a67006..000000000000
--- a/trunk/arch/arm/mach-ux500/include/mach/memory.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2009 ST-Ericsson
- *
- * 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(0x00000000)
-#define BUS_OFFSET	UL(0x00000000)
-
-#endif