diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-02 17:22:03 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:49 -0400 |
| commit | f431eb6960848302e82b7156bf30f726c8e6e7bc (patch) | |
| tree | c3c8ea4133db9dc891e5fdced594bf45a318ad09 | |
| parent | 0e79671e13d12e44938f5caea83176706e56e7ca (diff) | |
| download | linux-3.10-f431eb6960848302e82b7156bf30f726c8e6e7bc.tar.gz linux-3.10-f431eb6960848302e82b7156bf30f726c8e6e7bc.tar.bz2 linux-3.10-f431eb6960848302e82b7156bf30f726c8e6e7bc.zip | |
ARM: mach-zynq: 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-zynq/include/mach/memory.h | 22 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2dd0db697f6..322e48ce451 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -955,6 +955,7 @@ config ARCH_ZYNQ select ARM_AMBA select ICST select USE_OF + select NO_MACH_MEMORY_H help Support for Xilinx Zynq ARM Cortex A9 Platform endchoice diff --git a/arch/arm/mach-zynq/include/mach/memory.h b/arch/arm/mach-zynq/include/mach/memory.h deleted file mode 100644 index 35a92634dcc..00000000000 --- a/arch/arm/mach-zynq/include/mach/memory.h +++ /dev/null @@ -1,22 +0,0 @@ -/* arch/arm/mach-zynq/include/mach/memory.h - * - * Copyright (C) 2011 Xilinx - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MACH_MEMORY_H__ -#define __MACH_MEMORY_H__ - -#include <asm/sizes.h> - -#define PLAT_PHYS_OFFSET UL(0x0) - -#endif |