diff --git a/[refs] b/[refs]
index 598ecf12bd29..4d48e9248d8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45c79433c02b8fe7b8a1cbf60548a9798d0502ed
+refs/heads/master: de0c141feec6a5823461a4dbcc205c71ea601417
diff --git a/trunk/arch/arm/configs/s5pc100_defconfig b/trunk/arch/arm/configs/s5pc100_defconfig
index dc108afc060c..2053be6c9af1 100644
--- a/trunk/arch/arm/configs/s5pc100_defconfig
+++ b/trunk/arch/arm/configs/s5pc100_defconfig
@@ -171,7 +171,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
-CONFIG_ARCH_S5PC1XX=y
+CONFIG_ARCH_S5PC100=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_U300 is not set