diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-12-20 19:52:48 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-12-20 19:52:48 +0000 |
| commit | a33c0012ef7d53fee0089622b95f4122df655f46 (patch) | |
| tree | 0aa1755301017343fd3427f1b5b2cc825deb7e2f | |
| parent | 7e385f8261bb2ad4e4129af2504f8c9fe2ec8dfe (diff) | |
| download | mediapointer-dvb-s2-a33c0012ef7d53fee0089622b95f4122df655f46.tar.gz mediapointer-dvb-s2-a33c0012ef7d53fee0089622b95f4122df655f46.tar.bz2 | |
Give saa7134 DMA audio modules their own Kconfig options
From: Ricardo Cerqueira <v4l@cerqueira.org>
the saa7134 DMA sound modules now have their own Kconfig entries, and
if built statically enforce exclusivity
Signed-off-by:
| -rw-r--r-- | linux/drivers/media/video/saa7134/Kconfig | 27 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/Makefile | 7 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 40 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig index c512c4411..ec8dc1fe7 100644 --- a/linux/drivers/media/video/saa7134/Kconfig +++ b/linux/drivers/media/video/saa7134/Kconfig @@ -1,11 +1,10 @@ config VIDEO_SAA7134 tristate "Philips SAA7134 support" - depends on VIDEO_DEV && PCI && I2C && SOUND && SND + depends on VIDEO_DEV && PCI && I2C select VIDEO_BUF select VIDEO_IR select VIDEO_TUNER select CRC32 - select SND_PCM_OSS ---help--- This is a video4linux driver for Philips SAA713x based TV cards. @@ -13,6 +12,30 @@ config VIDEO_SAA7134 To compile this driver as a module, choose M here: the module will be called saa7134. +config VIDEO_SAA7134_ALSA + tristate "Philips SAA7134 DMA audio support" + depends on VIDEO_SAA7134 && SOUND && SND && (!VIDEO_SAA7134_OSS || VIDEO_SAA7134_OSS = m) + select SND_PCM_OSS + ---help--- + This is a video4linux driver for direct (DMA) audio in + Philips SAA713x based TV cards using ALSA + + To compile this driver as a module, choose M here: the + 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 || VIDEO_SAA7134_ALSA = m) + select SND_PCM_OSS + ---help--- + This is a video4linux driver for direct (DMA) audio in + Philips SAA713x based TV cards using OSS + + This is deprecated in favor of the ALSA module + + To compile this driver as a module, choose M here: the + module will be called saa7134-oss. + config VIDEO_SAA7134_DVB tristate "DVB/ATSC Support for saa7134 based TV cards" depends on VIDEO_SAA7134 && DVB_CORE diff --git a/linux/drivers/media/video/saa7134/Makefile b/linux/drivers/media/video/saa7134/Makefile index 134f83a96..1ba998424 100644 --- a/linux/drivers/media/video/saa7134/Makefile +++ b/linux/drivers/media/video/saa7134/Makefile @@ -4,8 +4,11 @@ saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ saa7134-video.o saa7134-input.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o \ - saa6752hs.o saa7134-alsa.o \ - saa7134-oss.o + saa6752hs.o + +obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o +obj-$(CONFIG_VIDEO_SAA7134_OSS) += saa7134-oss.o + obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o EXTRA_CFLAGS += -I$(src)/.. diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 7ea27b8b8..17bf214c2 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-20 19:48 rmcc + + * linux/drivers/media/video/saa7134/Kconfig: + * linux/drivers/media/video/saa7134/Makefile: + + - Split saa7134 dma sound modules from main saa7134 in kernel + build options. + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-20 17:23 mkrufky * linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c: |