Merge branch 'fix/misc' into topic/misc

[pandora-kernel.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 851716a..e4c97fd 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -426,6 +426,7 @@ config RADIO_TIMBERDALE
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
        depends on I2C && VIDEO_V4L2
+       select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
        ---help---
@@ -439,4 +440,7 @@ config RADIO_WL1273
          To compile this driver as a module, choose M here: the
          module will be called radio-wl1273.
 
+# TI's ST based wl128x FM radio
+source "drivers/media/radio/wl128x/Kconfig"
+
 endif # RADIO_ADAPTERS