summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-12 16:13:57 +0000
committerMichael Krufky <devnull@localhost>2006-01-12 16:13:57 +0000
commit153b99d30afb372746538aecfeb1ac768befc137 (patch)
tree1d3ccf966bdb0629aba5030ed86bd0bfb46f3da6
parent7044613081846d01580e24bea6ba361f45d28a65 (diff)
downloadmediapointer-dvb-s2-153b99d30afb372746538aecfeb1ac768befc137.tar.gz
mediapointer-dvb-s2-153b99d30afb372746538aecfeb1ac768befc137.tar.bz2
Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/cx88/Makefile1
-rw-r--r--v4l/ChangeLog7
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/Makefile b/linux/drivers/media/video/cx88/Makefile
index e4b2134fe..6e5eaa226 100644
--- a/linux/drivers/media/video/cx88/Makefile
+++ b/linux/drivers/media/video/cx88/Makefile
@@ -5,6 +5,7 @@ cx8802-objs := cx88-mpeg.o
obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o
obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx88-vp3054-i2c.o
+obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
EXTRA_CFLAGS += -I$(src)/..
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1a7a35c50..a44459729 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-12 16:13 mkrufky
+
+ * linux/drivers/media/video/cx88/Makefile:
+ - Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-12 13:26 mchehab
* linux/drivers/media/video/cx88/cx88-vp3054-i2c.c: