Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 7902de151cc5bedf339b2f5d75e694f5ad70cd78..b61908594b47389c00a07df25401e318e354b34b 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -10,35 +10,35 @@ choice
 
 config ARCH_MSM7X00A
        bool "MSM7x00A / MSM7x01A"
-       select MACH_TROUT if !MACH_HALIBUT
        select ARCH_MSM_ARM11
-       select MSM_SMD
-       select MSM_SMD_PKG3
        select CPU_V6
        select GPIO_MSM_V1
+       select MACH_TROUT if !MACH_HALIBUT
        select MSM_PROC_COMM
+       select MSM_SMD
+       select MSM_SMD_PKG3
 
 config ARCH_MSM7X30
        bool "MSM7x30"
-       select MACH_MSM7X30_SURF # if !
        select ARCH_MSM_SCORPION
-       select MSM_SMD
-       select MSM_VIC
        select CPU_V7
-       select MSM_GPIOMUX
        select GPIO_MSM_V1
+       select MACH_MSM7X30_SURF # if !
+       select MSM_GPIOMUX
        select MSM_PROC_COMM
+       select MSM_SMD
+       select MSM_VIC
 
 config ARCH_QSD8X50
        bool "QSD8X50"
-       select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
        select ARCH_MSM_SCORPION
-       select MSM_SMD
-       select MSM_VIC
        select CPU_V7
-       select MSM_GPIOMUX
        select GPIO_MSM_V1
+       select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
+       select MSM_GPIOMUX
        select MSM_PROC_COMM
+       select MSM_SMD
+       select MSM_VIC
 
 endchoice
 
@@ -47,10 +47,10 @@ config ARCH_MSM8X60
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
-       select MSM_V2_TLMM
        select GPIO_MSM_V2
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+       select MSM_V2_TLMM
        select USE_OF
 
 config ARCH_MSM8960
@@ -58,9 +58,9 @@ config ARCH_MSM8960
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
-       select MSM_V2_TLMM
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+       select MSM_V2_TLMM
        select USE_OF
 
 config MSM_HAS_DEBUG_UART_HS
@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF
 
 config MACH_QSD8X50A_ST1_5
        depends on ARCH_QSD8X50
-       select MSM_SOC_REV_A
        bool "QSD8x50A ST1.5"
+       select MSM_SOC_REV_A
        help
          Support for the Qualcomm ST1.5.