Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 850d5689b14d..6f92beaa5ac8 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -21,9 +21,8 @@ config MEDIA_TUNER
         tristate
         default VIDEO_MEDIA && I2C
         depends on VIDEO_MEDIA && I2C
-        select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -138,8 +137,6 @@ config MEDIA_TUNER_QT1010
 config MEDIA_TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
         depends on VIDEO_MEDIA && I2C
-        depends on HOTPLUG
-        select FW_LOADER
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
@@ -147,8 +144,6 @@ config MEDIA_TUNER_XC2028
 config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
         depends on VIDEO_MEDIA && I2C
-        depends on HOTPLUG
-        select FW_LOADER
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon tuner XC5000 from Xceive.
@@ -162,4 +157,11 @@ config MEDIA_TUNER_MXL5005S
         help
           A driver for the silicon tuner MXL5005S from MaxLinear.
 
+config MEDIA_TUNER_MXL5007T
+        tristate "MaxLinear MxL5007T silicon tuner"
+        depends on VIDEO_MEDIA && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon tuner MxL5007T from MaxLinear.
+
 endif # MEDIA_TUNER_CUSTOMIZE