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

[safe/jmp/linux-2.6] / drivers / media / video / pvrusb2 / Kconfig

diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 5645c93..19eb274 100644 (file)
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -1,10 +1,15 @@
 config VIDEO_PVRUSB2
        tristate "Hauppauge WinTV-PVR USB2 support"
-       depends on VIDEO_V4L2 && USB && I2C && EXPERIMENTAL
-       select FW_LOADER
+       depends on VIDEO_V4L2 && I2C
+       depends on VIDEO_MEDIA  # Avoids pvrusb = Y / DVB = M
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_CX2341X
+       select VIDEO_SAA711X
+       select VIDEO_CX25840
+       select VIDEO_MSP3400
+       select VIDEO_WM8775
+       select VIDEO_CS53L32A
        ---help---
          This is a video4linux driver for Conexant 23416 based
          usb2 personal video recorder devices.
@@ -12,35 +17,6 @@ config VIDEO_PVRUSB2
          To compile this driver as a module, choose M here: the
          module will be called pvrusb2
 
-config VIDEO_PVRUSB2_29XXX
-       bool "Hauppauge WinTV-PVR USB2 support for 29xxx model series"
-       depends on VIDEO_PVRUSB2 && EXPERIMENTAL
-       select VIDEO_SAA711X
-       select VIDEO_MSP3400
-       ---help---
-         This option enables support for WinTV-PVR USB2 devices whose
-         model number is of the form "29xxx" (leading prefix of "29"
-         followed by 3 digits).
-         To see if you may need this option, examine the white
-         sticker on the underside of your device.
-
-         If you are in doubt, say Y.
-
-config VIDEO_PVRUSB2_24XXX
-       bool "Hauppauge WinTV-PVR USB2 support for 24xxx model series"
-       depends on VIDEO_PVRUSB2 && EXPERIMENTAL
-       select VIDEO_CX25840
-       select VIDEO_WM8775
-       ---help---
-         This option enables inclusion of additional logic to operate
-         newer WinTV-PVR USB2 devices whose model number is of the
-         form "24xxx" (leading prefix of "24" followed by 3 digits).
-         To see if you may need this option, examine the white
-         sticker on the underside of your device.  Enabling this
-         option will not harm support for older devices.
-
-         If you are in doubt, say Y.
-
 config VIDEO_PVRUSB2_SYSFS
        bool "pvrusb2 sysfs support (EXPERIMENTAL)"
        default y
@@ -57,6 +33,25 @@ config VIDEO_PVRUSB2_SYSFS
 
          Note: This feature is experimental and subject to change.
 
+config VIDEO_PVRUSB2_DVB
+       bool "pvrusb2 ATSC/DVB support (EXPERIMENTAL)"
+       default y
+       depends on VIDEO_PVRUSB2 && DVB_CORE && EXPERIMENTAL
+       select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+       select DVB_S5H1409 if !DVB_FE_CUSTOMISE
+       select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
+       ---help---
+
+         This option enables a DVB interface for the pvrusb2 driver.
+         If your device does not support digital television, this
+         feature will have no affect on the driver's operation.
+
+         If you are in doubt, say Y.
+
 config VIDEO_PVRUSB2_DEBUGIFC
        bool "pvrusb2 debug interface"
        depends on VIDEO_PVRUSB2_SYSFS