summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-05 22:52:53 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-10-13 12:49:31 -0400
commitb890f6b59d1210c682b310a28dabd134674b81e0 (patch)
tree225f81bdd37444d0c3773da6154bbf64ed0653e2
parentf29781ac69c913272acf915c4d3aacc44af5ddfc (diff)
downloadlinux-3.10-b890f6b59d1210c682b310a28dabd134674b81e0.tar.gz
linux-3.10-b890f6b59d1210c682b310a28dabd134674b81e0.tar.bz2
linux-3.10-b890f6b59d1210c682b310a28dabd134674b81e0.zip
ARM: mach-pnx4008: 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-pnx4008/include/mach/memory.h21
2 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ecc18d51f33..dd72287cb29 100644
--- a/arch/arm/Kconfig
+++ b/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/arch/arm/mach-pnx4008/include/mach/memory.h b/arch/arm/mach-pnx4008/include/mach/memory.h
deleted file mode 100644
index 1275db61cee..00000000000
--- a/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