Merge branch 'omap/boards' into late/cleanup

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap1 / Kconfig

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index cba3f7191cfc32df8818178b971aae206cbac68c..cdd05f2e67ee87148a023bd2af8025fbfb5b5bff 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -8,15 +8,15 @@ comment "OMAP Core Type"
 config ARCH_OMAP730
        depends on ARCH_OMAP1
        bool "OMAP730 Based System"
+       select ARCH_OMAP_OTG
        select CPU_ARM926T
        select OMAP_MPU_TIMER
-       select ARCH_OMAP_OTG
 
 config ARCH_OMAP850
        depends on ARCH_OMAP1
        bool "OMAP850 Based System"
-       select CPU_ARM926T
        select ARCH_OMAP_OTG
+       select CPU_ARM926T
 
 config ARCH_OMAP15XX
        depends on ARCH_OMAP1
@@ -28,8 +28,8 @@ config ARCH_OMAP15XX
 config ARCH_OMAP16XX
        depends on ARCH_OMAP1
        bool "OMAP16xx Based System"
-       select CPU_ARM926T
        select ARCH_OMAP_OTG
+       select CPU_ARM926T
 
 comment "OMAP Board Type"
        depends on ARCH_OMAP1
@@ -55,12 +55,6 @@ config MACH_OMAP_H3
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
 
-config MACH_OMAP_HTCWIZARD
-       bool "HTC Wizard"
-       depends on ARCH_OMAP850
-       help
-         HTC Wizard smartphone support (AKA QTEK 9100, ...)
-
 config MACH_HERALD
        bool "HTC Herald"
        depends on ARCH_OMAP850
@@ -132,8 +126,8 @@ config MACH_OMAP_PALMTT
 
 config MACH_SX1
        bool "Siemens SX1"
-       select I2C
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       select I2C
        help
          Support for the Siemens SX1 phone. To boot the kernel,
          you'll need a SX1 compatible bootloader; check out