summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/msm_defconfig
diff options
context:
space:
mode:
authorIngo Molnar2008-10-24 12:48:46 +0200
committerIngo Molnar2008-10-24 12:48:46 +0200
commit8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch)
treed535f46a917e14e90deccb29ad00aac016ad18dd /arch/arm/configs/msm_defconfig
parentsched: add CONFIG_SMP consistency (diff)
parentLinux 2.6.28-rc1 (diff)
downloadkernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz
kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.xz
kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'arch/arm/configs/msm_defconfig')
-rw-r--r--arch/arm/configs/msm_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index ae4c5e62086a..3b4ecf2a90dd 100644
--- 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