diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 12:32:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 12:32:51 -0800 |
| commit | e98092bedcfff1908ad7a32acc46f13e4d8b2f43 (patch) | |
| tree | ab29029aefe73578e73b86b50d747a042aa7ca32 /drivers/media/radio | |
| parent | 971316f0503a5c50633d07b83b6db2f15a3a5b00 (diff) | |
| parent | fda27874de91d5a8b9a018b3bc74b14578994908 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] hdpvr: update picture controls to support firmware versions > 0.15
[media] wl128x: fix build errors when GPIOLIB is not enabled
[media] hdpvr: fix race conditon during start of streaming
[media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes
[media] imon: don't wedge hardware after early callbacks
Diffstat (limited to 'drivers/media/radio')
| -rw-r--r-- | drivers/media/radio/wl128x/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig index 86b28579f0c..ea1e6545df3 100644 --- a/drivers/media/radio/wl128x/Kconfig +++ b/drivers/media/radio/wl128x/Kconfig @@ -4,8 +4,8 @@ menu "Texas Instruments WL128x FM driver (ST based)" config RADIO_WL128X tristate "Texas Instruments WL128x FM Radio" - depends on VIDEO_V4L2 && RFKILL - select TI_ST if NET && GPIOLIB + depends on VIDEO_V4L2 && RFKILL && GPIOLIB + select TI_ST if NET help Choose Y here if you have this FM radio chip. |