From: Nicolas Pitre Date: Fri, 2 Sep 2011 21:22:03 +0000 (-0400) Subject: ARM: mach-zynq: remove mach/memory.h X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f431eb6960848302e82b7156bf30f726c8e6e7bc;p=mv-sheeva.git ARM: mach-zynq: remove mach/memory.h Signed-off-by: Nicolas Pitre --- 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 - -#define PLAT_PHYS_OFFSET UL(0x0) - -#endif