diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:57 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:47 -0400 |
| commit | f4220feb35e39dc3963f27dcce48b4dea398a83b (patch) | |
| tree | ebba635b85c6cc2920895185c536a315fceb222b | |
| parent | 3bc465aab08f382a3005aa56296a3f7a549f379f (diff) | |
| download | linux-3.10-f4220feb35e39dc3963f27dcce48b4dea398a83b.tar.gz linux-3.10-f4220feb35e39dc3963f27dcce48b4dea398a83b.tar.bz2 linux-3.10-f4220feb35e39dc3963f27dcce48b4dea398a83b.zip | |
ARM: mach-pxa: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 20 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/z2.c | 2 |
3 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 30ced8d7282..f7041031bb1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -658,6 +658,7 @@ config ARCH_PXA select SPARSE_IRQ select AUTO_ZRELADDR select MULTI_IRQ_HANDLER + select NO_MACH_MEMORY_H help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h deleted file mode 100644 index d05a59727d6..00000000000 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * arch/arm/mach-pxa/include/mach/memory.h - * - * Author: Nicolas Pitre - * Copyright: (C) 2001 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 version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -/* - * Physical DRAM offset. - */ -#define PLAT_PHYS_OFFSET UL(0xa0000000) - -#endif diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 65fed3753fa..84ed72de53b 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -686,7 +686,7 @@ static void z2_power_off(void) */ PSPR = 0x0; local_irq_disable(); - pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); + pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PHYS_OFFSET - PAGE_OFFSET); } #else #define z2_power_off NULL |