diff options
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 8 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2438ce305..20a9b7a93 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-01 16:53 mkrufky + + * scripts/merge-trees.sh, scripts/unmerge-trees.sh: + - dvb-bt8xx and DST build re-renabled in tree-merge. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-30 15:21 mchehab * saa7134-cards.c: (saa7134_board_init1): 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 diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 2d9914a87..2d8ef70bf 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -54,7 +54,7 @@ diff -up video4linux/Make.config video4linux.orig/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/Makefile video4linux.orig/Makefile |