summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts')
-rw-r--r--v4l/scripts/merge-trees.sh38
1 files changed, 0 insertions, 38 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index a2958c364..3f8a53aaa 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -24,44 +24,6 @@ done
cd $CWD
echo .
-echo creating symlinks
-ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c
-ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h
-ln -s $V4L/drivers/media/dvb/frontends/mt352.c mt352.c
-ln -s $V4L/drivers/media/dvb/frontends/mt352.h mt352.h
-ln -s $V4L/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/cx22702.c cx22702.c
-ln -s $V4L/drivers/media/dvb/frontends/cx22702.h cx22702.h
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/or51132.c or51132.c
-ln -s $V4L/drivers/media/dvb/frontends/or51132.h or51132.h
-ln -s $V4L/drivers/media/dvb/frontends/tda1004x.c tda1004x.c
-ln -s $V4L/drivers/media/dvb/frontends/tda1004x.h tda1004x.h
-ln -s $V4L/drivers/media/dvb/frontends/sp887x.c sp887x.c
-ln -s $V4L/drivers/media/dvb/frontends/sp887x.h sp887x.h
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000.c nxt6000.c
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000.h nxt6000.h
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/cx24110.c cx24110.c
-ln -s $V4L/drivers/media/dvb/frontends/cx24110.h cx24110.h
-ln -s $V4L/drivers/media/dvb/frontends/or51211.c or51211.c
-ln -s $V4L/drivers/media/dvb/frontends/or51211.h or51211.h
-ln -s $V4L/drivers/media/dvb/bt8xx/bt878.c bt878.c
-ln -s $V4L/drivers/media/dvb/bt8xx/bt878.h bt878.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst.c dst.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_common.h dst_common.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h
-ln -s $V4L/drivers/media/dvb/dvb-core/dvbdev.h dvbdev.h
-ln -s $V4L/drivers/media/dvb/dvb-core/dmxdev.h dmxdev.h
-ln -s $V4L/drivers/media/dvb/dvb-core/dvb_demux.h dvb_demux.h
-ln -s $V4L/drivers/media/dvb/dvb-core/dvb_net.h dvb_net.h
-ln -s $V4L/drivers/media/dvb/dvb-core/dvb_frontend.h dvb_frontend.h
patch -p2 <<'DIFF'
diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
--- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400