---

yaml --- r: 270187 b: refs/heads/master c: 8b5da2d h: refs/heads/master i: 270185: 2a4a81a 270183: f262585 v: v3
git-mirror · Oct 13, 2011 · d7dcf42 · d7dcf42
1 parent 167dc35
commit d7dcf42
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 37 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfc1ef96a873d35d2fb86ac8ccf34d388a48e55
+refs/heads/master: 8b5da2df272d5aaceb17addae8afc068b447aa51
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -711,6 +711,7 @@ config ARCH_S3C2410
 	select CLKDEV_LOOKUP
 	select ARCH_USES_GETTIMEOFFSET
 	select HAVE_S3C2410_I2C if I2C
+	select NO_MACH_MEMORY_H
 	help
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

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