summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/Makefile3
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/Makefile b/linux/drivers/media/video/saa7134/Makefile
index 937dff8d5..23b251ae7 100644
--- a/linux/drivers/media/video/saa7134/Makefile
+++ b/linux/drivers/media/video/saa7134/Makefile
@@ -1,7 +1,8 @@
saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \
saa7134-oss.o saa7134-ts.o saa7134-tvaudio.o \
- saa7134-vbi.o saa7134-video.o saa7134-input.o
+ saa7134-vbi.o saa7134-video.o saa7134-input.o \
+ saa7134-alsa.o
obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index dc72675ee..cb8836f68 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-06 13:06 mchehab
+
+ * ../linux/drivers/media/video/saa7134/Makefile:
+ - Fixes saa7134-alsa build inside saa7134 driver.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-06 05:46 mchehab
* ../linux/drivers/media/video/em28xx/em28xx-core.c: