lkml.org 
[lkml]   [2005]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: Recursive dependency for SAA7134 in 2.6.15-rc7
From
Date
Em Sex, 2005-12-30 às 12:06 +0100, Jean Delvare escreveu:
> Hi Mauro,

> Can you please rebase it on Linus' latest (2.6.15-rc7-git4)? So that I
> can give it a try...
Updated.
>
> Thanks,
Cheers,
Mauro.
V4L/DVB: change alsa/oss option to choice

From: <>

Using tristate choice Kconfig option seems to produce a
better result.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
drivers/media/video/saa7134/Kconfig | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 8a5c3e7..70f03f5 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -12,9 +12,14 @@ config VIDEO_SAA7134
To compile this driver as a module, choose M here: the
module will be called saa7134.

+choice
+ prompt "Philips SAA7134 DMA audio support"
+ depends on VIDEO_SAA7134 && SOUND
+ default m
+
config VIDEO_SAA7134_ALSA
- tristate "Philips SAA7134 DMA audio support"
- depends on VIDEO_SAA7134 && SND
+ tristate "ALSA audio support"
+ depends on SND
select SND_PCM_OSS
---help---
This is a video4linux driver for direct (DMA) audio in
@@ -24,8 +29,8 @@ config VIDEO_SAA7134_ALSA
module will be called saa7134-alsa.

config VIDEO_SAA7134_OSS
- tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)"
- depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA
+ tristate "OSS audio support (DEPRECATED)"
+ depends on SOUND_PRIME
---help---
This is a video4linux driver for direct (DMA) audio in
Philips SAA713x based TV cards using OSS
@@ -34,6 +39,7 @@ config VIDEO_SAA7134_OSS

To compile this driver as a module, choose M here: the
module will be called saa7134-oss.
+endchoice

config VIDEO_SAA7134_DVB
tristate "DVB/ATSC Support for saa7134 based TV cards"
\
 
 \ /
  Last update: 2005-12-30 14:41    [from the cache]
©2003-2011 Jasper Spaans. Advertise on this site