summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-06 06:52:53 +0400
committerNicolas Pitre <nico@fluxnic.net>2011-10-13 20:49:32 +0400
commit489a1b5b894d6df2908b914ee9d0619a8ffc8e3e (patch)
tree76d29a904c9d358ce43890e37896917acf30cc1f
parentb890f6b59d1210c682b310a28dabd134674b81e0 (diff)
downloadlinux-489a1b5b894d6df2908b914ee9d0619a8ffc8e3e.tar.xz
ARM: mach-iop32x: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-iop32x/include/mach/memory.h13
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dd72287cb29c..2ac205106003 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -452,6 +452,7 @@ config ARCH_IOP32X
select PLAT_IOP
select PCI
select ARCH_REQUIRE_GPIOLIB
+ select NO_MACH_MEMORY_H
help
Support for Intel's 80219 and IOP32X (XScale) family of
processors.
diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h
deleted file mode 100644
index 169cc239f76c..000000000000
--- a/arch/arm/mach-iop32x/include/mach/memory.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-iop32x/include/mach/memory.h
- */
-
-#ifndef __MEMORY_H
-#define __MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET UL(0xa0000000)
-
-#endif