summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/bttv.h3
-rw-r--r--linux/include/linux/videodev.h1
-rw-r--r--v4l/ChangeLog12
-rw-r--r--v4l/scripts/merge-trees.sh50
-rw-r--r--v4l/scripts/unmerge-trees.sh50
5 files changed, 103 insertions, 13 deletions
diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h
index 981c02981..c26d1dfd9 100644
--- a/linux/drivers/media/video/bttv.h
+++ b/linux/drivers/media/video/bttv.h
@@ -1,5 +1,5 @@
/*
- * $Id: bttv.h,v 1.22 2005/07/28 18:41:21 mchehab Exp $
+ * $Id: bttv.h,v 1.23 2005/08/28 18:22:34 mkrufky Exp $
*
* bttv - Bt848 frame grabber driver
*
@@ -17,6 +17,7 @@
#include <linux/videodev.h>
#include <linux/i2c.h>
+#include "compat.h"
/* ---------------------------------------------------------- */
/* exported by bttv-cards.c */
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h
index d2d8928ec..b93a78041 100644
--- a/linux/include/linux/videodev.h
+++ b/linux/include/linux/videodev.h
@@ -17,6 +17,7 @@
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
#include <linux/device.h>
#endif
+#include "compat.h"
struct video_device
{
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index d96feb2b4..8a7b227ee 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-28 18:15 mkrufky
+
+ * scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+ - include files into tree-merge necessary for the
+ dvb-bt8xx and dst dvb modules, based on bt8xx chips.
+ This also includes all dvb frontends used by bt8xx boards.
+
+ * bttv.h, videodev.h:
+ - #include "compat.h", needed for tree-merge.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-08-25 05:59 mkrufky
* cx88-dvb.c: (dvb_register):
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 1d573b30b..7e3574cec 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -15,11 +15,47 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.h tda1004x.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.c sp887x.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/sp887x.h sp887x.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.c nxt6000.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000.h nxt6000.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.c cx24110.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx24110.h cx24110.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.c or51211.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51211.h or51211.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.c bt878.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/bt878.h bt878.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst.c dst.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_common.h dst_common.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h
patch -p1 <<'DIFF'
+diff -upr video4linux.orig/Make.config video4linux/Make.config
+--- video4linux.orig/Make.config 2005-08-28 12:00:10.000000000 +0000
++++ video4linux/Make.config 2005-08-28 12:31:17.000000000 +0000
+@@ -14,6 +14,7 @@ CONFIG_VIDEO_ALSA := n
+
+ CONFIG_VIDEO_CX88_DVB := n
+ CONFIG_VIDEO_SAA7134_DVB := n
++CONFIG_DVB_BT8XX := n
+
+ ifneq ($(KERNELRELEASE),)
+ need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
+@@ -22,5 +23,6 @@ endif
+ ifeq ($(need_dvb),yes)
+ CONFIG_VIDEO_CX88_DVB := m
+ CONFIG_VIDEO_SAA7134_DVB := m
++ CONFIG_DVB_BT8XX := m
+ endif
+
diff -upr video4linux.orig/Makefile video4linux/Makefile
---- video4linux.orig/Makefile 2005-08-17 00:48:25.000000000 +0000
-+++ video4linux/Makefile 2005-08-17 00:50:13.000000000 +0000
-@@ -45,8 +45,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
+--- video4linux.orig/Makefile 2005-08-28 12:00:10.000000000 +0000
++++ video4linux/Makefile 2005-08-28 12:29:03.000000000 +0000
+@@ -45,8 +45,10 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o
obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
@@ -27,10 +63,12 @@ diff -upr video4linux.orig/Makefile video4linux/Makefile
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
++obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
++obj-$(CONFIG_DVB_BT8XX) += mt352.o sp887x.o nxt6000.o cx24110.o or51211.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -60,6 +60,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -60,6 +62,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
endif
# for DVB
@@ -38,7 +76,7 @@ diff -upr video4linux.orig/Makefile video4linux/Makefile
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -138,6 +139,7 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
+@@ -138,6 +141,7 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko
inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko
inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
@@ -46,7 +84,7 @@ diff -upr video4linux.orig/Makefile video4linux/Makefile
v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
-@@ -157,6 +159,9 @@ install:: rminstall
+@@ -157,6 +161,9 @@ install:: rminstall
-install -d $(KDIR26)/common
-install -m 644 -c $(inst_common) $(KDIR26)/common
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 8b2d5b2a9..4b76857c1 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -15,22 +15,60 @@ rm or51132.c
rm or51132.h
rm tda1004x.c
rm tda1004x.h
+rm sp887x.c
+rm sp887x.h
+rm nxt6000.c
+rm nxt6000.h
+rm nxt6000_priv.h
+rm cx24110.c
+rm cx24110.h
+rm or51211.c
+rm or51211.h
+rm bt878.c
+rm bt878.h
+rm dvb-bt8xx.c
+rm dvb-bt8xx.h
+rm dst.c
+rm dst_ca.c
+rm dst_ca.h
+rm dst_common.h
+rm dst_priv.h
patch -p1 <<'DIFF'
+diff -upr video4linux/Make.config video4linux.orig/Make.config
+--- video4linux/Make.config 2005-08-28 12:31:17.000000000 +0000
++++ video4linux.orig/Make.config 2005-08-28 12:00:10.000000000 +0000
+@@ -14,7 +14,6 @@ CONFIG_VIDEO_ALSA := n
+
+ CONFIG_VIDEO_CX88_DVB := n
+ CONFIG_VIDEO_SAA7134_DVB := n
+-CONFIG_DVB_BT8XX := n
+
+ ifneq ($(KERNELRELEASE),)
+ need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
+@@ -23,6 +22,5 @@ endif
+ ifeq ($(need_dvb),yes)
+ CONFIG_VIDEO_CX88_DVB := m
+ CONFIG_VIDEO_SAA7134_DVB := m
+- CONFIG_DVB_BT8XX := m
+ endif
+
diff -upr video4linux/Makefile video4linux.orig/Makefile
---- video4linux/Makefile 2005-08-17 00:50:13.000000000 +0000
-+++ video4linux.orig/Makefile 2005-08-17 00:48:25.000000000 +0000
-@@ -45,8 +45,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
+--- video4linux/Makefile 2005-08-28 12:29:03.000000000 +0000
++++ video4linux.orig/Makefile 2005-08-28 12:00:10.000000000 +0000
+@@ -45,10 +45,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o
obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
+-obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
+-obj-$(CONFIG_DVB_BT8XX) += mt352.o sp887x.o nxt6000.o cx24110.o or51211.o
+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -60,7 +60,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -62,7 +60,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
endif
# for DVB
@@ -38,7 +76,7 @@ diff -upr video4linux/Makefile video4linux.orig/Makefile
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -139,7 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
+@@ -141,7 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko
inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko
inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
@@ -46,7 +84,7 @@ diff -upr video4linux/Makefile video4linux.orig/Makefile
v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
-@@ -159,9 +157,6 @@ install:: rminstall
+@@ -161,9 +157,6 @@ install:: rminstall
-install -d $(KDIR26)/common
-install -m 644 -c $(inst_common) $(KDIR26)/common
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 04:54:38 +0000