From 846807d52918b80b74dc618971a252679c041b41 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 2 May 2008 12:31:51 +0200 Subject: [PATCH] --- yaml --- r: 96002 b: refs/heads/master c: 20686c24377246d9eb57782551b25ff19df09873 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/Kconfig | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8a9b933e7105..e64668d372b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b +refs/heads/master: 20686c24377246d9eb57782551b25ff19df09873 diff --git a/trunk/sound/pci/Kconfig b/trunk/sound/pci/Kconfig index 581debf37dcb..7e4742109572 100644 --- a/trunk/sound/pci/Kconfig +++ b/trunk/sound/pci/Kconfig @@ -515,19 +515,16 @@ config SND_FM801 config SND_FM801_TEA575X_BOOL bool "ForteMedia FM801 + TEA5757 tuner" depends on SND_FM801 + depends on VIDEO_V4L1=y || VIDEO_V4L1=SND_FM801 help Say Y here to include support for soundcards based on the ForteMedia FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media Forte SF256-PCS-02) into the snd-fm801 driver. - This will enable support for the old V4L1 API. - config SND_FM801_TEA575X tristate depends on SND_FM801_TEA575X_BOOL default SND_FM801 - select VIDEO_V4L1 - select VIDEO_DEV config SND_HDA_INTEL tristate "Intel HD Audio"