diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-31 20:58:53 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-31 20:58:53 +0000 |
| commit | a9ff6140f8e92cc2bf177238abadec338e4ed6a2 (patch) | |
| tree | 5df0ee92bf539ce115a86d6e32736174c04ccb96 /v4l/scripts/unmerge-trees.sh | |
| parent | 84f645bd8b3f5d0d6dbe0690609fab9394c9a247 (diff) | |
| download | mediapointer-dvb-s2-a9ff6140f8e92cc2bf177238abadec338e4ed6a2.tar.gz mediapointer-dvb-s2-a9ff6140f8e92cc2bf177238abadec338e4ed6a2.tar.bz2 | |
- Better method for Makefile to detect compilation against -mm tree.
Thanks to Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 82ec3b04f..a3224d794 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -38,7 +38,7 @@ diff -upr video4linux/Makefile video4linux.orig/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -132,7 +131,6 @@ ifeq ($(inst-m),) +@@ -126,7 +125,6 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -46,7 +46,7 @@ diff -upr video4linux/Makefile 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 -@@ -159,9 +157,6 @@ install:: rminstall +@@ -153,9 +151,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common |