summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-11-26 11:26:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-26 11:26:10 +0100
commit612275ad3966dd7ba491d5fe94e894a3861c9062 (patch)
treed2f81f0289020d3e36cc9761735775f7ce8b464a /arch/arm/mach-msm
parentMerge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentarm: kconfig: dis-allow hotplug on MSM (diff)
downloadlinux-612275ad3966dd7ba491d5fe94e894a3861c9062.tar.xz
linux-612275ad3966dd7ba491d5fe94e894a3861c9062.zip
Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index dbbcfeb919db..31e5fd63ec9a 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -49,6 +49,8 @@ endchoice
config MSM_SOC_REV_A
bool
+config ARCH_MSM_SCORPIONMP
+ bool
config ARCH_MSM_ARM11
bool