Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-s3c24x0 / memory.h

diff --git a/arch/arm/include/asm/arch-s3c24x0/memory.h b/arch/arm/include/asm/arch-s3c24x0/memory.h
index 61d62707c7d0aca937bc30adb7fd14d9b9bde1cf..d6a787b66369d76b4293383c5ebc864804c017b3 100644 (file)
--- a/arch/arm/include/asm/arch-s3c24x0/memory.h
+++ b/arch/arm/include/asm/arch-s3c24x0/memory.h
@@ -32,9 +32,6 @@
  */
 #define PHYS_OFFSET    (0x0c000000UL)
 
-#include <linux/config.h>
-
-
 /* Modified for S3C2400, by chc, 20010509 */
 #define RAM_IN_BANK_0  32*1024*1024
 #define RAM_IN_BANK_1  0