diff options
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 2 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
2 files changed, 2 insertions, 2 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 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 |