diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
tree | dca7934b27d510c9c006558979ebc48e07a531cf /drivers/media/radio/Kconfig | |
parent | b21a8ee67013372f439fbd1591e91d09de49bb9c (diff) | |
parent | c6b358748e19ce7e230b0926ac42696bc485a562 (diff) |
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 | |||
426 | config RADIO_WL1273 | 426 | config RADIO_WL1273 |
427 | tristate "Texas Instruments WL1273 I2C FM Radio" | 427 | tristate "Texas Instruments WL1273 I2C FM Radio" |
428 | depends on I2C && VIDEO_V4L2 | 428 | depends on I2C && VIDEO_V4L2 |
429 | select MFD_CORE | ||
429 | select MFD_WL1273_CORE | 430 | select MFD_WL1273_CORE |
430 | select FW_LOADER | 431 | select FW_LOADER |
431 | ---help--- | 432 | ---help--- |
@@ -439,4 +440,7 @@ config RADIO_WL1273 | |||
439 | To compile this driver as a module, choose M here: the | 440 | To compile this driver as a module, choose M here: the |
440 | module will be called radio-wl1273. | 441 | module will be called radio-wl1273. |
441 | 442 | ||
443 | # TI's ST based wl128x FM radio | ||
444 | source "drivers/media/radio/wl128x/Kconfig" | ||
445 | |||
442 | endif # RADIO_ADAPTERS | 446 | endif # RADIO_ADAPTERS |