diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2013-07-28 15:01:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-18 07:09:59 -0400 |
commit | 338c658a646721e94ca827c74163703612e164c5 (patch) | |
tree | 7e245f2ea24b0ff43927023527eb8b2b43c826d6 /sound/pci | |
parent | 59b564599bc66f086856b09e480f89555d47b35c (diff) |
[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')
-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 fe6fa93a6262..9df80efa4692 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -1,10 +1,5 @@ | |||
1 | # ALSA PCI drivers | 1 | # ALSA PCI drivers |
2 | 2 | ||
3 | config SND_TEA575X | ||
4 | tristate | ||
5 | depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK | ||
6 | default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK | ||
7 | |||
8 | menuconfig SND_PCI | 3 | menuconfig SND_PCI |
9 | bool "PCI sound devices" | 4 | bool "PCI sound devices" |
10 | depends on PCI | 5 | depends on PCI |
@@ -542,7 +537,9 @@ config SND_ES1968_INPUT | |||
542 | config SND_ES1968_RADIO | 537 | config SND_ES1968_RADIO |
543 | bool "Enable TEA5757 radio tuner support for es1968" | 538 | bool "Enable TEA5757 radio tuner support for es1968" |
544 | depends on SND_ES1968 | 539 | depends on SND_ES1968 |
540 | depends on MEDIA_RADIO_SUPPORT | ||
545 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 | 541 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 |
542 | select RADIO_TEA575X | ||
546 | help | 543 | help |
547 | Say Y here to include support for TEA5757 radio tuner integrated on | 544 | Say Y here to include support for TEA5757 radio tuner integrated on |
548 | some MediaForte cards (e.g. SF64-PCE2). | 545 | some MediaForte cards (e.g. SF64-PCE2). |
@@ -562,7 +559,9 @@ config SND_FM801 | |||
562 | config SND_FM801_TEA575X_BOOL | 559 | config SND_FM801_TEA575X_BOOL |
563 | bool "ForteMedia FM801 + TEA5757 tuner" | 560 | bool "ForteMedia FM801 + TEA5757 tuner" |
564 | depends on SND_FM801 | 561 | depends on SND_FM801 |
562 | depends on MEDIA_RADIO_SUPPORT | ||
565 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 | 563 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 |
564 | select RADIO_TEA575X | ||
566 | help | 565 | help |
567 | Say Y here to include support for soundcards based on the ForteMedia | 566 | Say Y here to include support for soundcards based on the ForteMedia |
568 | FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and | 567 | FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and |