diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2013-07-28 16:01:44 -0300 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:51:36 +0900 |
commit | 43fd0cee7befe752b5bf67e18b0bdb3cd96cf048 (patch) | |
tree | aba0cbba6fa68007ca89264d30c67dcbda05eb33 /sound/pci/Kconfig | |
parent | 6d77d8615d8893162410241fe96b6026d30a34b4 (diff) | |
download | linux-3.10-43fd0cee7befe752b5bf67e18b0bdb3cd96cf048.tar.gz linux-3.10-43fd0cee7befe752b5bf67e18b0bdb3cd96cf048.tar.bz2 linux-3.10-43fd0cee7befe752b5bf67e18b0bdb3cd96cf048.zip |
upstream: [media] tea575x: Move from sound to media
Move tea575x from sound/i2c/other to drivers/media/radio
Includes Kconfig changes by Hans Verkuil.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r-- | sound/pci/Kconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 3397ddbdfc0..fdc8fca19ab 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -1,10 +1,5 @@ # ALSA PCI drivers -config SND_TEA575X - tristate - depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK - default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK - menuconfig SND_PCI bool "PCI sound devices" depends on PCI @@ -549,7 +544,9 @@ config SND_ES1968_INPUT config SND_ES1968_RADIO bool "Enable TEA5757 radio tuner support for es1968" depends on SND_ES1968 + depends on MEDIA_RADIO_SUPPORT depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 + select RADIO_TEA575X help Say Y here to include support for TEA5757 radio tuner integrated on some MediaForte cards (e.g. SF64-PCE2). @@ -569,7 +566,9 @@ config SND_FM801 config SND_FM801_TEA575X_BOOL bool "ForteMedia FM801 + TEA5757 tuner" depends on SND_FM801 + depends on MEDIA_RADIO_SUPPORT depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 + select RADIO_TEA575X help Say Y here to include support for soundcards based on the ForteMedia FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and |