summaryrefslogtreecommitdiff
path: root/v4l/scripts/merge-trees.sh
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
-rw-r--r--v4l/scripts/merge-trees.sh2
1 files changed, 1 insertions, 1 deletions
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