summaryrefslogtreecommitdiff
path: root/v4l/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/Makefile')
-rw-r--r--v4l/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 37cfed5cc..73944eed5 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -18,7 +18,8 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \
bttv-vbi.o bttv-i2c.o
saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \
saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \
- saa7134-cards.o saa7134-ts.o saa7134-input.o
+ saa7134-cards.o saa7134-ts.o saa7134-input.o \
+ saa7134-alsa.o
cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \
cx88-input.o
cx8800-objs := cx88-video.o cx88-vbi.o
@@ -37,14 +38,11 @@ obj-$(CONFIG_TVP5150) += tvp5150.o
obj-$(CONFIG_SAA711X) += saa711x.o
obj-$(CONFIG_EM2820) += em2820.o
-ifeq ($(CONFIG_VIDEO_ALSA),m)
# THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!!
-ifeq ($(CONFIG_VIDEO_ALSA_TESTING),m)
+ifeq ($(CONFIG_VIDEO_ALSA),m)
cx8801-objs := cx88-alsa.o
obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o
endif
- saa7134-objs += saa7134-alsa.o
-endif
obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o