summaryrefslogtreecommitdiff
path: root/v4l/scripts/unmerge-trees.sh
blob: 6de4527cf7cb1115640d16705250d5ade7cf0615 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
#!/bin/sh

rm dvb-pll.c
rm dvb-pll.h
rm mt352.c
rm mt352.h
rm mt352_priv.h
rm cx22702.c
rm cx22702.h
rm lgdt3302.c
rm lgdt3302.h
rm lgdt3302_priv.h
rm or51132.c
rm or51132.h
rm tda1004x.c
rm tda1004x.h
patch -p1 <<'DIFF'
diff -upr video4linux/Makefile 
video4linux.orig/Makefile
--- video4linux/Makefile	2005-07-21 23:41:13.000000000 +0000
+++ video4linux.orig/Makefile	2005-07-21 23:39:50.000000000 +0000
@@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
 obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o
 obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o
 
-obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
+obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
 
 # 2.6-only stuff
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -123,7 +123,6 @@ ifeq ($(inst-m),)
 endif
 
 inst_common := ir-common.ko
-inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
 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
 	-install -d $(KDIR26)/common
 	-install -m 644 -c $(inst_common) $(KDIR26)/common
 
-	-install -d $(KDIR26)/dvb/frontends
-	-install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
-
 	-install -d $(KDIR26)/video
 	-install -m 644 -c $(inst_video) $(KDIR26)/video
 
diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
--- video4linux/cx88-dvb.c	2005-07-21 23:41:13.000000000 +0000
+++ video4linux.orig/cx88-dvb.c	2005-07-21 23:39:50.000000000 +0000
@@ -34,7 +34,11 @@
 #define CONFIG_DVB_MT352 1
 #define CONFIG_DVB_CX22702 1
 #define CONFIG_DVB_OR51132 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+#define CONFIG_DVB_LGDT3302 0
+#else
 #define CONFIG_DVB_LGDT3302 1
+#endif
 
 #include "cx88.h"
 #include "dvb-pll.h"
diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
--- video4linux/saa7134-dvb.c	2005-07-21 23:41:13.000000000 +0000
+++ video4linux.orig/saa7134-dvb.c	2005-07-21 23:39:50.000000000 +0000
@@ -32,7 +32,11 @@
 #include "compat.h"
 
 #define CONFIG_DVB_MT352 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
 #define CONFIG_DVB_TDA1004X 1
+#else
+#define CONFIG_DVB_TDA1004X 0
+#endif
 #include "saa7134-reg.h"
 #include "saa7134.h"