1 files changed, 35 insertions, 33 deletions

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 75e7d20b2984..1486d96fd4b6 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -15,22 +15,36 @@ config DVB_FE_CUSTOMISE
 comment "DVB-S (satellite) frontends"
         depends on DVB_CORE
 
-config DVB_STV0299
-        tristate "ST STV0299 based"
+config DVB_CX24110
+        tristate "Conexant CX24110 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_CX24110
-        tristate "Conexant CX24110 based"
+config DVB_CX24123
+        tristate "Conexant CX24123 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_CX24123
-        tristate "Conexant CX24123 based"
+config DVB_MT312
+        tristate "Zarlink VP310/MT312 based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S tuner module. Say Y when you want to support this frontend.
+
+config DVB_S5H1420
+        tristate "Samsung S5H1420 based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S tuner module. Say Y when you want to support this frontend.
+
+config DVB_STV0299
+        tristate "ST STV0299 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
@@ -43,8 +57,8 @@ config DVB_TDA8083
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_MT312
-        tristate "Zarlink VP310/MT312 based"
+config DVB_TDA10086
+        tristate "Philips TDA10086 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
@@ -57,19 +71,26 @@ config DVB_VES1X93
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_S5H1420
-        tristate "Samsung S5H1420 based"
+config DVB_TUNER_ITD1000
+        tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_TDA10086
-        tristate "Philips TDA10086 based"
+config DVB_TDA826X
+        tristate "Philips TDA826X silicon tuner"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
-          A DVB-S tuner module. Say Y when you want to support this frontend.
+          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
+
+config DVB_TUA6100
+        tristate "Infineon TUA6100 PLL"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S PLL chip.
 
 comment "DVB-T (terrestrial) frontends"
         depends on DVB_CORE
@@ -326,13 +347,6 @@ config DVB_PLL
           This module drives a number of tuners based on PLL chips with a
           common I2C interface. Say Y when you want to support these tuners.
 
-config DVB_TDA826X
-        tristate "Philips TDA826X silicon tuner"
-        depends on DVB_CORE && I2C
-        default m if DVB_FE_CUSTOMISE
-        help
-          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
-
 config DVB_TUNER_QT1010
         tristate "Quantek QT1010 silicon tuner"
         depends on DVB_CORE && I2C
@@ -370,12 +384,7 @@ config DVB_TUNER_DIB0070
           This device is only used inside a SiP called togther with a
           demodulator for now.
 
-config DVB_TUNER_ITD1000
-        tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"
-        depends on DVB_CORE && I2C
-        default m if DVB_FE_CUSTOMISE
-
-comment "Miscellaneous devices"
+comment "SEC control devices for DVB-S"
         depends on DVB_CORE
 
 config DVB_LNBP21
@@ -399,11 +408,4 @@ config DVB_ISL6421
         help
           An SEC control chip.
 
-config DVB_TUA6100
-        tristate "TUA6100 PLL"
-        depends on DVB_CORE && I2C
-        default m if DVB_FE_CUSTOMISE
-        help
-          A DVBS PLL chip.
-
 endmenu