---

yaml --- r: 270218 b: refs/heads/master c: 48de58e h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · dcaa350 · dcaa350
1 parent 3afd881
commit dcaa350
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: b4be3999d1895c9697580574ca4ea52d84bc4ddd
+refs/heads/master: 48de58e34ed379fa99d392a393b8d8343ab48515
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -781,6 +781,7 @@ config ARCH_S5P64X0
 	select HAVE_SCHED_CLOCK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C_RTC if RTC_CLASS
+	select NO_MACH_MEMORY_H
 	help
 	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
 	  SMDK6450.

diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h b/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h