diff options
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index fceb093b9494..614e41e7881b 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -48,9 +48,7 @@ config ARCH_MSM8X60 | |||
48 | select CPU_V7 | 48 | select CPU_V7 |
49 | select GPIO_MSM_V2 | 49 | select GPIO_MSM_V2 |
50 | select HAVE_SMP | 50 | select HAVE_SMP |
51 | select MSM_GPIOMUX | ||
52 | select MSM_SCM if SMP | 51 | select MSM_SCM if SMP |
53 | select MSM_V2_TLMM | ||
54 | select USE_OF | 52 | select USE_OF |
55 | 53 | ||
56 | config ARCH_MSM8960 | 54 | config ARCH_MSM8960 |
@@ -58,9 +56,8 @@ config ARCH_MSM8960 | |||
58 | select ARM_GIC | 56 | select ARM_GIC |
59 | select CPU_V7 | 57 | select CPU_V7 |
60 | select HAVE_SMP | 58 | select HAVE_SMP |
61 | select MSM_GPIOMUX | 59 | select GPIO_MSM_V2 |
62 | select MSM_SCM if SMP | 60 | select MSM_SCM if SMP |
63 | select MSM_V2_TLMM | ||
64 | select USE_OF | 61 | select USE_OF |
65 | 62 | ||
66 | config MSM_HAS_DEBUG_UART_HS | 63 | config MSM_HAS_DEBUG_UART_HS |
@@ -124,10 +121,10 @@ config MSM_SMD | |||
124 | bool | 121 | bool |
125 | 122 | ||
126 | config MSM_GPIOMUX | 123 | config MSM_GPIOMUX |
127 | bool | 124 | depends on !(ARCH_MSM8X60 || ARCH_MSM8960) |
128 | 125 | bool "MSM V1 TLMM GPIOMUX architecture" | |
129 | config MSM_V2_TLMM | 126 | help |
130 | bool | 127 | Support for MSM V1 TLMM GPIOMUX architecture. |
131 | 128 | ||
132 | config MSM_SCM | 129 | config MSM_SCM |
133 | bool | 130 | bool |