diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:06 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:10 +0000 |
commit | e0e5ce59dc7b2685516219fdf44f01a8d53e0228 (patch) | |
tree | 3c79c9c95589bba1b54f7c87172fcaa51d67a01b /drivers/media/radio/wl128x/Kconfig | |
parent | fdc24d4ba20499febb90ff17d3b75674026712f8 (diff) | |
parent | 6f6ea93705f8519fb53dbc1516abe94d1787f4c4 (diff) | |
download | blackbird-op-linux-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.tar.gz blackbird-op-linux-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.zip |
Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
ARM: dts: imx51-babbage: update mc13892 device
ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
ARM i.MX5/6: Add dt support for generic boards
ARM: imx5: generate dtbs for imx5 boards
(update to Linux 3.3-rc5)
Diffstat (limited to 'drivers/media/radio/wl128x/Kconfig')
-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 86b28579f0c7..ea1e6545df36 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. |