ARM: mach-s3c64xx: remove mach/memory.h
authorNicolas Pitre <nicolas.pitre@linaro.org>
Sat, 3 Sep 2011 01:48:28 +0000 (21:48 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Thu, 13 Oct 2011 16:49:51 +0000 (12:49 -0400)
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
arch/arm/Kconfig
arch/arm/mach-s3c64xx/include/mach/memory.h [deleted file]

index 408d413..a87deac 100644 (file)
@@ -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 (file)
index b704669..0000000
+++ /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