V4L/DVB (8534): remove select's of FW_LOADER

After commit d9b19199e4894089456aaad295023263b5225c1a
(always enable FW_LOADER unless EMBEDDED=y) we can remove
the FW_LOADER select's and corresponding dependencies
on HOTPLUG.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

8 files changed, 1 insertions, 16 deletions

diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 24a34fc1f2b3..ce71e8e7b835 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,9 +1,7 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
         depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index 9aefdc5ea79a..ef48565de7f1 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -2,9 +2,7 @@ config VIDEO_CX18
         tristate "Conexant cx23418 MPEG encoder support"
         depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
         depends on INPUT        # due to VIDEO_IR
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 5cfb46bbdaa9..e60bd31b51a3 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -1,9 +1,7 @@
 config VIDEO_CX23885
         tristate "Conexant cx23885 (2388x successor) support"
         depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
-        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_BTCX
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
index 448f4cd0ce34..de515dadadc2 100644
--- a/drivers/media/video/cx25840/Kconfig
+++ b/drivers/media/video/cx25840/Kconfig
@@ -1,8 +1,6 @@
 config VIDEO_CX25840
         tristate "Conexant CX2584x audio/video decoders"
         depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-        depends on HOTPLUG # due to FW_LOADER
-        select FW_LOADER
         ---help---
           Support for the Conexant CX2584x audio/video decoders.
 
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 10e20d8196dc..9dd7bdf659b9 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -33,9 +33,8 @@ config VIDEO_CX88_ALSA
 
 config VIDEO_CX88_BLACKBIRD
         tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
-        depends on VIDEO_CX88 && HOTPLUG
+        depends on VIDEO_CX88
         select VIDEO_CX2341X
-        select FW_LOADER
         ---help---
           This adds support for MPEG encoder cards based on the
           Blackbird reference design, using the Conexant 2388x
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 5d7ee8fcdd50..0069898bddab 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -2,9 +2,7 @@ config VIDEO_IVTV
         tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
         depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
         depends on INPUT   # due to VIDEO_IR
-        depends on HOTPLUG # due to FW_LOADER
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 4482b2c72ced..19eb274c9cd0 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -2,8 +2,6 @@ config VIDEO_PVRUSB2
         tristate "Hauppauge WinTV-PVR USB2 support"
         depends on VIDEO_V4L2 && I2C
         depends on VIDEO_MEDIA  # Avoids pvrusb = Y / DVB = M
-        depends on HOTPLUG      # due to FW_LOADER
-        select FW_LOADER
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 83f076abce35..7021bbf5897b 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -27,9 +27,7 @@ config VIDEO_SAA7134_ALSA
 config VIDEO_SAA7134_DVB
         tristate "DVB/ATSC Support for saa7134 based TV cards"
         depends on VIDEO_SAA7134 && DVB_CORE
-        depends on HOTPLUG      # due to FW_LOADER
         select VIDEOBUF_DVB
-        select FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE