linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / dvb-usb / Kconfig

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 75824b7..d3df120 100644 (file)
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -1,8 +1,7 @@
 config DVB_USB
        tristate "Support for various USB DVB devices"
 config DVB_USB
        tristate "Support for various USB DVB devices"

-       depends on DVB_CORE && USB && I2C
+       depends on DVB_CORE && USB

        select FW_LOADER
        select FW_LOADER

-       select DVB_PLL

        help
          By enabling this you will be able to choose the various supported
          USB1.1 and USB2.0 DVB devices.
        help
          By enabling this you will be able to choose the various supported
          USB1.1 and USB2.0 DVB devices.


@@ -89,7 +88,6 @@ config DVB_USB_CXUSB
        select DVB_CX22702
        select DVB_LGDT330X
        select DVB_MT352
        select DVB_CX22702
        select DVB_LGDT330X
        select DVB_MT352

-       select DVB_ZL10353

        help
          Say Y here to support the Conexant USB2.0 hybrid reference design.
          Currently, only DVB and ATSC modes are supported, analog mode
        help
          Say Y here to support the Conexant USB2.0 hybrid reference design.
          Currently, only DVB and ATSC modes are supported, analog mode


@@ -132,15 +130,6 @@ config DVB_USB_VP702X
 
          DVB-S USB2.0 receivers.
 
 
          DVB-S USB2.0 receivers.
 

-config DVB_USB_GP8PSK
-       tristate "GENPIX 8PSK->USB module support"
-       depends on DVB_USB
-       help
-         Say Y here to support the
-           GENPIX 8psk module
-
-         DVB-S USB2.0 receivers.
-

 config DVB_USB_NOVA_T_USB2
        tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
        depends on DVB_USB
 config DVB_USB_NOVA_T_USB2
        tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
        depends on DVB_USB