diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-02 21:48:28 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:51 -0400 |
| commit | b4be3999d1895c9697580574ca4ea52d84bc4ddd (patch) | |
| tree | 621bde9b2acb17ac84cb5dde4cecd670704713e9 | |
| parent | c039bad00f21a025df6fcb238578023c2cc881bf (diff) | |
| download | linux-3.10-b4be3999d1895c9697580574ca4ea52d84bc4ddd.tar.gz linux-3.10-b4be3999d1895c9697580574ca4ea52d84bc4ddd.tar.bz2 linux-3.10-b4be3999d1895c9697580574ca4ea52d84bc4ddd.zip | |
ARM: mach-s3c64xx: 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-s3c64xx/include/mach/memory.h | 18 |
2 files changed, 1 insertions, 18 deletions
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 <ben@simtec.co.uk> - * 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 |