diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 05:26:10 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 05:26:10 -0500 |
| commit | 612275ad3966dd7ba491d5fe94e894a3861c9062 (patch) | |
| tree | d2f81f0289020d3e36cc9761735775f7ce8b464a /arch/arm/mach-msm | |
| parent | 698fd6a2c3ca05ec796072defb5c415289a86cdc (diff) | |
| parent | 176bfc44417544724e6df0831a7f576f4a56283d (diff) | |
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/Kconfig | 2 |
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 | |||
| 49 | 49 | ||
| 50 | config MSM_SOC_REV_A | 50 | config MSM_SOC_REV_A |
| 51 | bool | 51 | bool |
| 52 | config ARCH_MSM_SCORPIONMP | ||
| 53 | bool | ||
| 52 | 54 | ||
| 53 | config ARCH_MSM_ARM11 | 55 | config ARCH_MSM_ARM11 |
| 54 | bool | 56 | bool |