diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 14 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 2 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 0b3b1e854..7590fa5ea 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,17 @@ +2005-11-22 03:46 mkrufky + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - DST build currently disabled in merged-tree build environment. + Currently broken in merged v4l+dvb trees due to some changes + in include/linux/dvb/frontend.h + + To re-enable it, edit Make.config + + - DST is NOT broken in dvb-kernel cvs. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-22 03:43 mkrufky * ../v4l/Make.config: diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index f1e91546c..5e8173cbe 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -34,7 +34,7 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m + CONFIG_DVB_BT8XX := m -+ CONFIG_DVB_BT8XX_DST := m ++ CONFIG_DVB_BT8XX_DST := n + CONFIG_DVB_FRONTENDS := m endif diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index f5f335178..e294c65d7 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -15,7 +15,7 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m - CONFIG_DVB_BT8XX := m -- CONFIG_DVB_BT8XX_DST := m +- CONFIG_DVB_BT8XX_DST := n - CONFIG_DVB_FRONTENDS := m endif |