---

yaml --- r: 270217 b: refs/heads/master c: b4be399 h: refs/heads/master i: 270215: 064660a v: v3
git-mirror · Oct 13, 2011 · 3afd881 · 3afd881
1 parent ff972bd
commit 3afd881
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c039bad00f21a025df6fcb238578023c2cc881bf
+refs/heads/master: b4be3999d1895c9697580574ca4ea52d84bc4ddd
diff --git a/trunk/arch/arm/Kconfig b/trunk/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/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h b/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h