diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-01 16:55:07 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-01 16:55:07 +0000 |
| commit | 490591975ea47ec8b2bcfecf099d5af2588c8b2b (patch) | |
| tree | 0392727c313351aad04af1feba9730d425130d3f /v4l/scripts/merge-trees.sh | |
| parent | ff14b7f33c3b5b046d15bee11968c798826f1add (diff) | |
| download | mediapointer-dvb-s2-490591975ea47ec8b2bcfecf099d5af2588c8b2b.tar.gz mediapointer-dvb-s2-490591975ea47ec8b2bcfecf099d5af2588c8b2b.tar.bz2 | |
dvb-bt8xx and DST build re-renabled in tree-merge.
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 34b803e1b..aa7a7fb7f 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -1,11 +1,5 @@ #!/bin/sh -echo V4L: WARNING! bt8xx tree-merge is currently broken. dvb/bt8xx build -echo disabled. To force dvb-bt8xx, bt878 and dst build, edit Make.config -echo If you need this feature to work, please use an older video4linux cvs: -echo . -echo cvs co -D 9/29/05 video4linux -echo . echo creating symlinks ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h @@ -60,7 +54,7 @@ diff -up video4linux.orig/Make.config video4linux/Make.config ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m -+ CONFIG_DVB_BT8XX := n ++ CONFIG_DVB_BT8XX := m endif diff -up video4linux.orig/Makefile video4linux/Makefile |