diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
tree | dca7934b27d510c9c006558979ebc48e07a531cf /drivers/media/radio/Kconfig | |
parent | [media] remove radio-maestro (diff) | |
parent | ALSA: hda - Fix pin-config of Gigabyte mobo (diff) | |
download | linux-cdccfc8dc0bf62a1da327324a8d639139acc9279.tar.xz linux-cdccfc8dc0bf62a1da327324a8d639139acc9279.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/media/radio/Kconfig')
-rw-r--r-- | drivers/media/radio/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 851716a7da0e..e4c97fd6f05a 100644 --- 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 |