From 284ba76564bf24db6924edc293426dde57860c10 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 21 Apr 2012 06:57:29 -0700
Subject: [PATCH] --- yaml --- r: 299790 b: refs/heads/master c:
 18ea1fcd7ef19e496c523d814d52261cc4777f51 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/configs/mini2440_defconfig | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75051a520f54..57904096b4f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5699b0ca05f781d496d20ba87f916bd9eec7ea6a
+refs/heads/master: 18ea1fcd7ef19e496c523d814d52261cc4777f51
diff --git a/trunk/arch/arm/configs/mini2440_defconfig b/trunk/arch/arm/configs/mini2440_defconfig
index 42da9183acc8..082175c54e7c 100644
--- a/trunk/arch/arm/configs/mini2440_defconfig
+++ b/trunk/arch/arm/configs/mini2440_defconfig
@@ -14,6 +14,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_ARCH_S3C24XX=y
+# CONFIG_CPU_S3C2410 is not set
+CONFIG_CPU_S3C2440=y
 CONFIG_S3C_ADC=y
 CONFIG_S3C24XX_PWM=y
 CONFIG_MACH_MINI2440=y