Rename lgdt3302 to lgdt330x.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

4 files changed, 26 insertions, 15 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 77bd94f6b..f4a076a1a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-25 05:06  mkrufky
+	* cx88-dvb.c, cx88-i2c.c, Makefile:
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- Rename lgdt3302 to lgdt330x.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-07-24 22:08  mkrufky
 	* cx88-dvb.c, saa7134-dvb.c, Makefile:
 	- The #define CONFIG_DVB_* are actually CFLAGS set by Makefile.
diff --git a/v4l/Makefile b/v4l/Makefile
index 69029d0f7..b7c9b6f58 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -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
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
 
 # 2.6-only stuff
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -60,7 +60,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
  EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
  EXTRA_CFLAGS += -DHAVE_CX22702=1
  EXTRA_CFLAGS += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_LGDT3302=1
+ EXTRA_CFLAGS += -DHAVE_LGDT330X=1
  EXTRA_CFLAGS += -DHAVE_MT352=1
 endif
 ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
@@ -123,6 +123,7 @@ ifeq ($(inst-m),)
 endif
 
 inst_common := ir-common.ko
+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.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
@@ -149,6 +150,9 @@ 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 --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index de987444d..9a16be40b 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -7,9 +7,9 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h           mt352.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h      mt352_priv.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c         cx22702.c
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h         cx22702.h
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.c        lgdt3302.c
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h        lgdt3302.h
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h   lgdt3302_priv.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c        lgdt330x.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h        lgdt330x.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h   lgdt330x_priv.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c         or51132.c
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h         or51132.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c        tda1004x.c
@@ -23,7 +23,7 @@ patch -p1 <<'DIFF'
  
 -obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o
 -obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.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_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
 +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
  
  # 2.6-only stuff
@@ -32,7 +32,7 @@ patch -p1 <<'DIFF'
  endif
  
  inst_common := ir-common.ko
-+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
++inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.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
@@ -54,7 +54,7 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
  #include "compat.h"
  
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
--#undef HAVE_LGDT3302
+-#undef HAVE_LGDT330X
 -#endif
 -
  #include "cx88.h"
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 49f22b3a0..2ea436e6a 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -7,9 +7,9 @@ rm mt352.h
 rm mt352_priv.h
 rm cx22702.c
 rm cx22702.h
-rm lgdt3302.c
-rm lgdt3302.h
-rm lgdt3302_priv.h
+rm lgdt330x.c
+rm lgdt330x.h
+rm lgdt330x_priv.h
 rm or51132.c
 rm or51132.h
 rm tda1004x.c
@@ -23,7 +23,7 @@ video4linux.orig/Makefile
  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_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.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
@@ -34,7 +34,7 @@ video4linux.orig/Makefile
  endif
  
  inst_common := ir-common.ko
--inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
+-inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.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
@@ -56,7 +56,7 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
  #include "compat.h"
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+#undef HAVE_LGDT3302
++#undef HAVE_LGDT330X
 +#endif
 +
  #include "cx88.h"