Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 3553babbbf0541653a899ee3b18317736a01ba79..d140abca690afdee1a0c78a0a288ec545312f3f2 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,18 +1,13 @@
-if ARCH_MSM7X00A
+if ARCH_MSM
 
-comment "MSM7X00A Board Type"
-       depends on ARCH_MSM7X00A
+comment "MSM Board Type"
+       depends on ARCH_MSM
 
 config MACH_HALIBUT
-       depends on ARCH_MSM7X00A
+       depends on ARCH_MSM
        default y
-       bool "Halibut Board (QCT SURF7200A)"
+       bool "Halibut Board (QCT SURF7201A)"
        help
-         Support for the Qualcomm SURF7200A eval board.
-
-config MSM7X00A_IDLE
-       depends on ARCH_MSM7X00A
-       default y
-       bool "Idle Support for MSM7X00A"
+         Support for the Qualcomm SURF7201A eval board.
 
 endif