diff options
-rw-r--r-- | v4l/scripts/merge-trees.sh | 5 | ||||
-rw-r--r-- | v4l/scripts/unmerge-trees.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 4fe91137f..edc7c8a3a 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -33,6 +33,11 @@ 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 +ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvbdev.h dvbdev.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dmxdev.h dmxdev.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_demux.h dvb_demux.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.h dvb_net.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_frontend.h dvb_frontend.h patch -p1 <<'DIFF' diff -up video4linux.orig/Make.config video4linux/Make.config --- video4linux.orig/Make.config 2005-08-28 12:00:10.000000000 +0000 diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 1275774d7..6458cd0e8 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -33,6 +33,11 @@ rm dst_ca.c rm dst_ca.h rm dst_common.h rm dst_priv.h +rm dvbdev.h +rm dmxdev.h +rm dvb_demux.h +rm dvb_net.h +rm dvb_frontend.h patch -p1 <<'DIFF' diff -up video4linux/Make.config video4linux.orig/Make.config --- video4linux/Make.config 2005-08-28 12:31:17.000000000 +0000 |