diff options
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 7 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index aa7a7fb7f..48b08a949 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -1,5 +1,10 @@ #!/bin/sh +echo V4L: WARNING! bt8xx tree-merge is currently broken. +echo If you need this feature, 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 @@ -54,7 +59,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 := m ++ CONFIG_DVB_BT8XX := n endif diff -up video4linux.orig/Makefile video4linux/Makefile diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 2d8ef70bf..2d9914a87 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 := m +- CONFIG_DVB_BT8XX := n endif diff -up video4linux/Makefile video4linux.orig/Makefile |