* audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c,

          cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h,
          i2c-compat.h, id.h, msp3400.h, or51132.c, or51132.h, plx9054.h,
          rds-saa6588.c, saa7134-dvb.c, tda7432.c, tda9875.c, tvaudio.c,
          tveeprom.h, tvmixer.c, v4l1-compat.c, video-buf-dvb.h:

        - Minor changes to synchronize with -mm series;

        - PAL-60 code maintained for SAA7134. However, -mm has different
          values;

        - Now, every .c or .h file has cvs field ID.

6 files changed, 24 insertions, 136 deletions

diff --git a/v4l/.buildpatch b/v4l/.buildpatch
index dc5a5630b..acbce9ad0 100644
--- a/v4l/.buildpatch
+++ b/v4l/.buildpatch
@@ -1,67 +1,3 @@
-srcdiff	ir-kbd-i2c.c	drivers/media/video/ir-kbd-i2c.c
-srcdiff	ir-kbd-gpio.c	drivers/media/video/ir-kbd-gpio.c
-srcdiff	bt848.h		drivers/media/video/bt848.h
-srcdiff	bttv.h		drivers/media/video/bttv.h
-srcdiff	bttvp.h		drivers/media/video/bttvp.h
-srcdiff	bttv-driver.c	drivers/media/video/bttv-driver.c
-srcdiff	bttv-cards.c	drivers/media/video/bttv-cards.c
-srcdiff	bttv-if.c	drivers/media/video/bttv-if.c
-srcdiff	bttv-risc.c	drivers/media/video/bttv-risc.c
-srcdiff	bttv-vbi.c	drivers/media/video/bttv-vbi.c
-srcdiff	bttv-gpio.c	drivers/media/video/bttv-gpio.c
-srcdiff	bttv-i2c.c	drivers/media/video/bttv-i2c.c
-
-srcdiff	btcx-risc.h	drivers/media/video/btcx-risc.h
-srcdiff	btcx-risc.c	drivers/media/video/btcx-risc.c
-srcdiff cx88.h			drivers/media/video/cx88/cx88.h
-srcdiff cx88-reg.h		drivers/media/video/cx88/cx88-reg.h
-
-srcdiff cx88-cards.c		drivers/media/video/cx88/cx88-cards.c
-srcdiff cx88-core.c		drivers/media/video/cx88/cx88-core.c
-srcdiff cx88-i2c.c		drivers/media/video/cx88/cx88-i2c.c
-srcdiff cx88-tvaudio.c		drivers/media/video/cx88/cx88-tvaudio.c
-srcdiff cx88-video.c		drivers/media/video/cx88/cx88-video.c
-srcdiff cx88-vbi.c		drivers/media/video/cx88/cx88-vbi.c
-srcdiff cx88-input.c		drivers/media/video/cx88/cx88-input.c
-
-srcdiff cx88-mpeg.c		drivers/media/video/cx88/cx88-mpeg.c
-srcdiff cx88-dvb.c		drivers/media/video/cx88/cx88-dvb.c
-srcdiff cx88-blackbird.c	drivers/media/video/cx88/cx88-blackbird.c
-srcdiff	cx22702.h	drivers/media/dvb/frontends/cx22702.h
-srcdiff	cx22702.c	drivers/media/dvb/frontends/cx22702.c
-srcdiff	mt352.h		drivers/media/dvb/frontends/mt352.h
-srcdiff	mt352.c		drivers/media/dvb/frontends/mt352.c
-srcdiff	or51132.h	drivers/media/dvb/frontends/or51132.h
-srcdiff	or51132.c	drivers/media/dvb/frontends/or51132.c
-srcdiff	dvb-pll.h	drivers/media/dvb/frontends/dvb-pll.h
-srcdiff	dvb-pll.c	drivers/media/dvb/frontends/dvb-pll.c
-srcdiff	bt832.c		drivers/media/video/bt832.c
-srcdiff	bt832.h		drivers/media/video/bt832.h
-srcdiff	ir-common.h	include/media/ir-common.h
-srcdiff	ir-common.c	drivers/media/common/ir-common.c
-srcdiff	audiochip.h	include/media/audiochip.h
-srcdiff	id.h		include/media/id.h
-srcdiff	msp3400.c	drivers/media/video/msp3400.c
-srcdiff	msp3400.h	drivers/media/video/msp3400.h
-srcdiff	tda7432.c	drivers/media/video/tda7432.c
-srcdiff	tda9875.c	drivers/media/video/tda9875.c
-srcdiff	tvaudio.h	drivers/media/video/tvaudio.h
-srcdiff	tvaudio.c	drivers/media/video/tvaudio.c
-srcdiff	tvmixer.c	drivers/media/video/tvmixer.c
-srcdiff	tuner.h		include/media/tuner.h
-srcdiff	tuner-core.c	drivers/media/video/tuner-core.c
-srcdiff	tuner-simple.c	drivers/media/video/tuner-simple.c
-srcdiff	mt20xx.c	drivers/media/video/mt20xx.c
-srcdiff	tda8290.c	drivers/media/video/tda8290.c
-srcdiff	tda9887.c	drivers/media/video/tda9887.c
-srcdiff	tea6757.c	drivers/media/video/tea6757.c
-
-srcdiff	tuner.h		include/media/tuner.h
-srcdiff	tuner-core.c	drivers/media/video/tuner-core.c
-srcdiff	tuner-simple.c	drivers/media/video/tuner-simple.c
-srcdiff	mt20xx.c	drivers/media/video/mt20xx.c
-srcdiff	tda8290.c	drivers/media/video/tda8290.c
-srcdiff	tda9887.c	drivers/media/video/tda9887.c
 srcdiff	saa7134.h		drivers/media/video/saa7134/saa7134.h
 srcdiff	saa7134-reg.h		drivers/media/video/saa7134/saa7134-reg.h
 
@@ -84,74 +20,4 @@ srcdiff	tveeprom.h	include/media/tveeprom.h
 srcdiff	tveeprom.c	drivers/media/video/tveeprom.c
 srcdiff	videodev.h	include/linux/videodev.h
 srcdiff	videodev2.h	include/linux/videodev2.h
-#srcdiff	videodev.c	drivers/media/video/videodev.c
-srcdiff	v4l1-compat.c	drivers/media/video/v4l1-compat.c
-srcdiff	v4l2-common.c	drivers/media/video/v4l2-common.c
-# bttv
-srcdiff	doc/README.bttv		Documentation/video4linux/bttv/README
-srcdiff	doc/insmod-options	Documentation/video4linux/bttv/Insmod-options
-srcdiff	doc/MAKEDEV		Documentation/video4linux/bttv/MAKEDEV
-srcdiff	doc/Sound-FAQ		Documentation/video4linux/bttv/Sound-FAQ
-srcdiff	doc/Tuners		Documentation/video4linux/bttv/Tuners
-srcdiff	doc/Cards		Documentation/video4linux/bttv/Cards
-
-# other
-srcdiff /dev/null               Documentation/video4linux/MAKEDEV
-srcdiff /dev/null               Documentation/video4linux/bttv/CARDLIST
-srcdiff doc/README.cx88		Documentation/video4linux/README.cx88
-srcdiff doc/README.saa7134	Documentation/video4linux/README.saa7134
-srcdiff doc/README.ir		Documentation/video4linux/README.ir
-srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt
-
-# cardlists
-srcdiff	doc/CARDLIST.bttv	Documentation/video4linux/CARDLIST.bttv
-srcdiff	doc/CARDLIST.saa7134	Documentation/video4linux/CARDLIST.saa7134
-srcdiff	doc/CARDLIST.tuner	Documentation/video4linux/CARDLIST.tuner
-srcdiff	doc/CARDLIST.cx88	Documentation/video4linux/CARDLIST.cx88
-
-# API
-srcdiff /dev/null		Docummentation/video4linux/API.html
-srcdiff doc/V4L1_API.html	Docummentation/video4linux/V4L1_API.html
-srcdiff doc/V4L2_API.html	Docummentation/video4linux/V4L2_API.html
-
-# obsolete / fixme
-#srcdiff	doc/Specs		Documentation/video4linux/bttv/Specs
-#srcdiff	README.freeze		Documentation/video4linux/bttv/README.freeze
-#srcdiff	README.quirks		Documentation/video4linux/bttv/README.quirks
-#srcdiff	Modules.conf		Documentation/video4linux/bttv/Modules.conf
-# bttv
-srcdiff	doc/README.bttv		Documentation/video4linux/bttv/README
-srcdiff	doc/insmod-options	Documentation/video4linux/bttv/Insmod-options
-srcdiff	doc/MAKEDEV		Documentation/video4linux/bttv/MAKEDEV
-srcdiff	doc/Sound-FAQ		Documentation/video4linux/bttv/Sound-FAQ
-srcdiff	doc/Tuners		Documentation/video4linux/bttv/Tuners
-srcdiff	doc/Cards		Documentation/video4linux/bttv/Cards
-
-# other
-srcdiff /dev/null               Documentation/video4linux/MAKEDEV
-srcdiff /dev/null               Documentation/video4linux/bttv/CARDLIST
-srcdiff doc/README.cx88		Documentation/video4linux/README.cx88
-srcdiff doc/README.saa7134	Documentation/video4linux/README.saa7134
-srcdiff doc/README.ir		Documentation/video4linux/README.ir
-srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt
-
-# cardlists
-srcdiff	doc/CARDLIST.bttv	Documentation/video4linux/CARDLIST.bttv
-srcdiff	doc/CARDLIST.saa7134	Documentation/video4linux/CARDLIST.saa7134
-srcdiff	doc/CARDLIST.tuner	Documentation/video4linux/CARDLIST.tuner
-srcdiff	doc/CARDLIST.cx88	Documentation/video4linux/CARDLIST.cx88
-
-# API
-srcdiff /dev/null		Docummentation/video4linux/API.html
-srcdiff doc/V4L1_API.html	Docummentation/video4linux/V4L1_API.html
-srcdiff doc/V4L2_API.html	Docummentation/video4linux/V4L2_API.html
 
-# obsolete / fixme
-#srcdiff	doc/Specs		Documentation/video4linux/bttv/Specs
-#srcdiff	README.freeze		Documentation/video4linux/bttv/README.freeze
-#srcdiff	README.quirks		Documentation/video4linux/bttv/README.quirks
-#srcdiff	Modules.conf		Documentation/video4linux/bttv/Modules.conf
-srcdiff	video-buf.h		include/media/video-buf.h
-srcdiff	video-buf-dvb.h		include/media/video-buf-dvb.h
-srcdiff	video-buf.c		drivers/media/video/video-buf.c
-srcdiff	video-buf-dvb.c		drivers/media/video/video-buf-dvb.c
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1eb90ba34..4aea77658 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-12 04:08 mchehab
+	* audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c, 
+	  cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h,
+	  i2c-compat.h, id.h, msp3400.h, or51132.c, or51132.h, plx9054.h,
+	  rds-saa6588.c, saa7134-dvb.c, tda7432.c, tda9875.c, tvaudio.c, 
+	  tveeprom.h, tvmixer.c, v4l1-compat.c, video-buf-dvb.h:
+
+	- Minor changes to synchronize with -mm series;
+
+	- PAL-60 code maintained for SAA7134. However, -mm has different
+	  values;
+
+	- Now, every .c or .h file has cvs field ID.
+
 2005-06-12 01:35 mchehab
 	* tuner-core.c:
 
@@ -5,7 +19,7 @@
 
 	- Solved a problem compiling without CONFIG_TUNER_MULTI_I2C
 
-	- cx88-i2c.c, saa7134-i2c.c:
+	* cx88-i2c.c, saa7134-i2c.c:
 
 	- Make it compatible with kernel 2.6.12-rc6-mm1
 
diff --git a/v4l/compat.h b/v4l/compat.h
index c88ae1f98..c81154aff 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: compat.h,v 1.11 2005/06/12 04:19:19 mchehab Exp $
+ */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
 # define irqreturn_t void
 # define IRQ_RETVAL(foobar)
diff --git a/v4l/i2c-compat.h b/v4l/i2c-compat.h
index 4e93d6ea0..4f8fbd022 100644
--- a/v4l/i2c-compat.h
+++ b/v4l/i2c-compat.h
@@ -1,4 +1,6 @@
 /*
+ * $Id: i2c-compat.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $
+ *
  * some i2c layer compatibility stuff -- to avoid cluttering up the
  * i2c modules with tons of #ifdefs
  */
diff --git a/v4l/or51132.c b/v4l/or51132.c
index 219ac7474..97b876149 100644
--- a/v4l/or51132.c
+++ b/v4l/or51132.c
@@ -454,7 +454,7 @@ unsigned int i100x20log10[] = {
   3964, 3969, 3973, 3978, 3982, 3986, 3991, 3995, 4000, 4004,
 };
 
-unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
+static unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
 
 unsigned int i20Log10(unsigned short val)
 {
diff --git a/v4l/or51132.h b/v4l/or51132.h
index 622cdd183..9450bd568 100644
--- a/v4l/or51132.h
+++ b/v4l/or51132.h
@@ -1,4 +1,6 @@
 /*
+ * $Id: or51132.h,v 1.5 2005/06/12 04:19:19 mchehab Exp $
+ *
  *    Support for OR51132 (pcHDTV HD-3000) - VSB/QAM
  *
  *    Copyright (C) 2005 Kirk Lapray <kirk_lapray@bigfoot.com>