diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-19 21:37:30 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-30 19:34:45 -0700 |
| commit | 02bf48f46f26eba66fb111a1e51d11d50b58f7eb (patch) | |
| tree | 36045a5c3d77402cb6f69b7ac95bc82d9e0441c6 /arch/arm/mach-msm | |
| parent | ed4d765adf405ebcc461b29646bb819eba5dc1ba (diff) | |
Revert "ARM: Push selects for TWD/SCU into machine entries"
This reverts commit 4c3ffffdbca2e6f6f5125fa7b149d87a13f92c94.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index fceb093b9494..b61908594b47 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -44,10 +44,10 @@ endchoice config ARCH_MSM8X60 bool "MSM8X60" + select ARCH_MSM_SCORPIONMP select ARM_GIC select CPU_V7 select GPIO_MSM_V2 - select HAVE_SMP select MSM_GPIOMUX select MSM_SCM if SMP select MSM_V2_TLMM @@ -55,9 +55,9 @@ config ARCH_MSM8X60 config ARCH_MSM8960 bool "MSM8960" + select ARCH_MSM_SCORPIONMP select ARM_GIC select CPU_V7 - select HAVE_SMP select MSM_GPIOMUX select MSM_SCM if SMP select MSM_V2_TLMM @@ -68,6 +68,9 @@ config MSM_HAS_DEBUG_UART_HS config MSM_SOC_REV_A bool +config ARCH_MSM_SCORPIONMP + bool + select HAVE_SMP config ARCH_MSM_ARM11 bool |