Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 3f40f375981bfa38946ebb8de1201dc6158cfdea..83567b898d09758e9610e82ad2113f01768227f1 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -417,6 +417,18 @@ config RADIO_TEA5764_XTAL
          Say Y here if TEA5764 have a 32768 Hz crystal in circuit, say N
          here if TEA5764 reference frequency is connected in FREQIN.
 
+config RADIO_SAA7706H
+       tristate "SAA7706H Car Radio DSP"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         Say Y here if you want to use the SAA7706H Car radio Digital
+         Signal Processor, found for instance on the Russellville development
+         board. On the russellville the device is connected to internal
+         timberdale I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called SAA7706H.
+
 config RADIO_TEF6862
        tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"
        depends on I2C && VIDEO_V4L2
@@ -429,4 +441,15 @@ config RADIO_TEF6862
          To compile this driver as a module, choose M here: the
          module will be called TEF6862.
 
+config RADIO_TIMBERDALE
+       tristate "Enable the Timberdale radio driver"
+       depends on MFD_TIMBERDALE && VIDEO_V4L2
+       depends on I2C  # for RADIO_SAA7706H
+       select RADIO_TEF6862
+       select RADIO_SAA7706H
+       ---help---
+         This is a kind of umbrella driver for the Radio Tuner and DSP
+         found behind the Timberdale FPGA on the Russellville board.
+         Enabling this driver will automatically select the DSP and tuner.
+
 endif # RADIO_ADAPTERS