diff options
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 4 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 9a16be40b..b538c26b1 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -28,7 +28,7 @@ patch -p1 <<'DIFF' # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -123,6 +123,7 @@ ifeq ($(inst-m),) +@@ -131,6 +131,7 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -36,7 +36,7 @@ patch -p1 <<'DIFF' inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko inst_video += video-buf.ko video-buf-dvb.ko -@@ -149,6 +150,9 @@ install:: rminstall +@@ -157,6 +158,9 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 2ea436e6a..84061fae7 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -30,7 +30,7 @@ video4linux.orig/Makefile # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -123,7 +123,6 @@ ifeq ($(inst-m),) +@@ -131,7 +131,6 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -38,7 +38,7 @@ video4linux.orig/Makefile inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko inst_video += video-buf.ko video-buf-dvb.ko -@@ -150,9 +149,6 @@ install:: rminstall +@@ -158,9 +157,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common |