summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/Makefile23
-rw-r--r--linux/drivers/media/video/saa7134/Makefile17
-rw-r--r--v4l/ChangeLog8
3 files changed, 48 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/Makefile b/linux/drivers/media/video/cx88/Makefile
new file mode 100644
index 000000000..107e48645
--- /dev/null
+++ b/linux/drivers/media/video/cx88/Makefile
@@ -0,0 +1,23 @@
+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
+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
+
+EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_DVB_CX22702),n)
+ EXTRA_CFLAGS += -DHAVE_CX22702=1
+endif
+ifneq ($(CONFIG_DVB_OR51132),n)
+ EXTRA_CFLAGS += -DHAVE_OR51132=1
+endif
+ifneq ($(CONFIG_DVB_LGDT330X),n)
+ EXTRA_CFLAGS += -DHAVE_LGDT330X=1
+endif
+ifneq ($(CONFIG_DVB_MT352),n)
+ EXTRA_CFLAGS += -DHAVE_MT352=1
+endif
diff --git a/linux/drivers/media/video/saa7134/Makefile b/linux/drivers/media/video/saa7134/Makefile
new file mode 100644
index 000000000..b778ffd94
--- /dev/null
+++ b/linux/drivers/media/video/saa7134/Makefile
@@ -0,0 +1,17 @@
+
+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
+
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
+
+EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_DVB_MT352),n)
+ EXTRA_CFLAGS += -DHAVE_MT352=1
+endif
+ifneq ($(CONFIG_DVB_TDA1004X),n)
+ EXTRA_CFLAGS += -DHAVE_TDA1004X=1
+endif
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index d39d5dc6e..ec087bb6c 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-11 21:00 mkrufky
+
+ * ../linux/drivers/media/video/cx88/Makefile:
+ * ../linux/drivers/media/video/saa7134/Makefile:
+ - import cx88 and saa7134 Makefile(s) from 2.6.14-rc4
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-11 20:28 mchehab
* ../linux/drivers/media/video/wm8775.c: