From: Nicolas Pitre Date: Sat, 3 Sep 2011 01:48:28 +0000 (-0400) Subject: ARM: mach-s3c64xx: remove mach/memory.h X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b4be3999d1895c9697580574ca4ea52d84bc4ddd;p=mv-sheeva.git ARM: mach-s3c64xx: remove mach/memory.h Signed-off-by: Nicolas Pitre --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 408d413826c..a87deac9f76 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -765,6 +765,7 @@ config ARCH_S3C64XX select SAMSUNG_GPIOLIB_4BIT select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG + select NO_MACH_MEMORY_H help Samsung S3C64XX series based systems diff --git a/arch/arm/mach-s3c64xx/include/mach/memory.h b/arch/arm/mach-s3c64xx/include/mach/memory.h deleted file mode 100644 index b704669f95f..00000000000 --- a/arch/arm/mach-s3c64xx/include/mach/memory.h +++ /dev/null @@ -1,18 +0,0 @@ -/* arch/arm/mach-s3c6400/include/mach/memory.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * Ben Dooks - * http://armlinux.simtec.co.uk/ - * - * 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 - -#define PLAT_PHYS_OFFSET UL(0x50000000) - -#endif