Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 2b96a757f513f464bdb5529823376320aa03e5f7..41bbae2c8e596e18cf899016b43dd81445ca6102 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -4,12 +4,12 @@
 
 menuconfig RADIO_ADAPTERS
        bool "Radio Adapters"
-       depends on VIDEO_DEV
+       depends on VIDEO_V4L2
        default y
        ---help---
          Say Y here to enable selecting AM/FM radio adapters.
 
-if RADIO_ADAPTERS && VIDEO_DEV
+if RADIO_ADAPTERS && VIDEO_V4L2
 
 config RADIO_CADET
        tristate "ADS Cadet AM/FM Tuner"
@@ -366,4 +366,14 @@ config USB_DSBR
          To compile this driver as a module, choose M here: the
          module will be called dsbr100.
 
+config USB_SI470X
+       tristate "Silicon Labs Si470x FM Radio Receiver support"
+       depends on USB && VIDEO_V4L2
+       ---help---
+         Say Y here if you want to connect this type of radio to your
+         computer's USB port.
+
+         To compile this driver as a module, choose M here: the
+         module will be called radio-silabs.
+
 endif # RADIO_ADAPTERS