Merge commit 'v2.6.29-rc1' into core/urgent

[karo-tx-linux.git] / arch / arm / configs / msm_defconfig

diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index ae4c5e62086ac454b7e4e140ec66f0acc74dcfbf..3b4ecf2a90ddd0328e08a44ce018243b1ac665f4 100644 (file)
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -133,7 +133,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_MSM7X00A=y
+CONFIG_ARCH_MSM=y
 
 #
 # Boot options