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 f8bf9fe37d36a57ce135f958704dcb20aaf073ac..06accb16c8bc1030c6e54f246a2f8ab876f70885 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -111,11 +111,16 @@ config RADIO_AZTECH_PORT
          jumper sets the card to 0x358.
 
 config RADIO_GEMTEK
-       tristate "GemTek Radio Card support"
+       tristate "GemTek Radio card (or compatible) support"
        depends on ISA && VIDEO_V4L2
        ---help---
          Choose Y here if you have this FM radio card, and then fill in the
-         port address below.
+         I/O port address and settings below. The following cards either have
+         GemTek Radio tuner or are rebranded GemTek Radio cards:
+
+         - Sound Vision 16 Gold with FM Radio
+         - Typhoon Radio card (some models)
+         - Hama Radio card
 
          In order to control your radio card, you will need to use programs
          that are compatible with the Video For Linux API.  Information on
@@ -126,14 +131,25 @@ config RADIO_GEMTEK
          module will be called radio-gemtek.
 
 config RADIO_GEMTEK_PORT
-       hex "GemTek i/o port (0x20c, 0x30c, 0x24c or 0x34c)"
+       hex "Fixed I/O port (0x20c, 0x30c, 0x24c, 0x34c, 0c24c or 0x28c)"
        depends on RADIO_GEMTEK=y
        default "34c"
        help
          Enter either 0x20c, 0x30c, 0x24c or 0x34c here. The card default is
          0x34c, if you haven't changed the jumper setting on the card. On
          Sound Vision 16 Gold PnP with FM Radio (ESS1869+FM Gemtek), the I/O
-         port is 0x28c.
+         port is 0x20c, 0x248 or 0x28c.
+         If automatic I/O port probing is enabled this port will be used only
+         in case of automatic probing failure, ie. as a fallback.
+
+config RADIO_GEMTEK_PROBE
+       bool "Automatic I/O port probing"
+       depends on RADIO_GEMTEK=y
+       default y
+       help
+         Say Y here to enable automatic probing for GemTek Radio card. The
+         following ports will be probed: 0x20c, 0x30c, 0x24c, 0x34c, 0x248 and
+         0x28c.
 
 config RADIO_GEMTEK_PCI
        tristate "GemTek PCI Radio Card support"
@@ -323,6 +339,21 @@ config RADIO_ZOLTRIX_PORT
        help
          Enter the I/O port of your Zoltrix radio card.
 
+config RADIO_TEA5761
+       tristate "Philips Semiconductors TEA5761 I2C FM Radio"
+       select I2C
+       select VIDEO_V4L2
+       help
+         Choose Y here if you have one of these AM/FM radio cards.
+
+         In order to control your radio card, you will need to use programs
+         that are compatible with the Video For Linux 2 API.  Information on
+         this API and pointers to "v4l" programs may be found at
+         <file:Documentation/video4linux/API.html>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called radio-tea5761.
+
 config USB_DSBR
        tristate "D-Link/GemTek USB FM radio support"
        depends on USB && VIDEO_V4L2
@@ -335,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