diff options
| author | Ricardo Cerqueira <v4l@cerqueira.org> | 2005-12-20 18:26:26 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-12-22 07:55:06 -0200 |
| commit | 7bb9529602f8bb41a92275825b808a42ed33e5be (patch) | |
| tree | d719928ae348342b47e50578155ef51f8e85fae3 /drivers/media/video/saa7134/Makefile | |
| parent | d5ea4e26602fa7f5141872f2c17a862f1974a73f (diff) | |
| download | kernel-crypto-7bb9529602f8bb41a92275825b808a42ed33e5be.tar.gz kernel-crypto-7bb9529602f8bb41a92275825b808a42ed33e5be.tar.xz kernel-crypto-7bb9529602f8bb41a92275825b808a42ed33e5be.zip | |
V4L/DVB (3200): Fix saa7134 ALSA/OSS collisions
- When ALSA or OSS are loaded, check if the other is present
Fixed hotplug notifiers cleanup on module removal
- The saa7134 DMA sound modules now have their own Kconfig entries, and
if built statically enforce exclusivity
- SND_PCM_OSS isn't necessary for the OSS driver
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/saa7134/Makefile')
| -rw-r--r-- | drivers/media/video/saa7134/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 134f83a9621..1ba998424bb 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/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)/.. |