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

[sfrench/cifs-2.6.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9b26976fb0842ef90ab83fcf4ebbc6edbcb069f1..a6b50e62a49529650d3ffdaa161e52e79e377d9a 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -106,7 +106,4 @@ config MSM_GPIOMUX
        help
          Support for MSM V1 TLMM GPIOMUX architecture.
 
-config MSM_SCM
-       bool
-
 endif