- Syncrhronized with linux-2.6.12-rc6-mm1.

        - Should compile cleanly with linux-2.6.11 also.


make snapshot improved.

5 files changed, 18 insertions, 9 deletions

diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 79d871bca..93317f6ce 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.48 2005/05/24 23:41:42 nsh Exp $
+    $Id: bttv-cards.c,v 1.49 2005/06/10 17:20:24 mchehab Exp $
 
     bttv-cards.c
 
@@ -1957,7 +1957,6 @@ struct tvcard bttv_tvcards[] = {
         .no_tda9875     = 1,
         .no_tda7432     = 1,
         .tuner_type     = TUNER_ABSENT,
-        .no_video       = 1,
 	.pll            = PLL_28,
 },{
 	.name           = "Teppro TEV-560/InterVision IV-560",
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index b6f69b7f6..c27b2758f 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.37 2005/02/21 13:57:59 kraxel Exp $
+    $Id: bttv-driver.c,v 1.38 2005/06/10 17:20:24 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -3176,7 +3176,7 @@ static struct video_device radio_template =
 /* ----------------------------------------------------------------------- */
 /* some debug code                                                         */
 
-int bttv_risc_decode(u32 risc)
+static int bttv_risc_decode(u32 risc)
 {
 	static char *instr[16] = {
 		[ BT848_RISC_WRITE     >> 28 ] = "write",
@@ -3213,8 +3213,8 @@ int bttv_risc_decode(u32 risc)
 	return incr[risc >> 28] ? incr[risc >> 28] : 1;
 }
 
-void bttv_risc_disasm(struct bttv *btv,
-		      struct btcx_riscmem *risc)
+static void bttv_risc_disasm(struct bttv *btv,
+			     struct btcx_riscmem *risc)
 {
 	unsigned int i,j,n;
 
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c
index b9aaede82..7d0d95ff8 100644
--- a/linux/drivers/media/video/bttv-i2c.c
+++ b/linux/drivers/media/video/bttv-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-i2c.c,v 1.20 2005/05/24 12:16:56 kraxel Exp $
+    $Id: bttv-i2c.c,v 1.21 2005/06/10 17:20:24 mchehab Exp $
 
     bttv-i2c.c  --  all the i2c code is here
 
@@ -241,7 +241,7 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
        	return retval;
 }
 
-static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
+static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
 {
 	struct bttv *btv = i2c_get_adapdata(i2c_adap);
 	int retval = 0;
@@ -315,7 +315,6 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 
 static struct i2c_client bttv_i2c_client_template = {
 	I2C_DEVNAME("bttv internal"),
-        .id       = -1,
 };
 
 
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 63d6f5822..907419570 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-10 17:15 mchehab
+	* bttv-cards.c, bttv-driver.c, bttv-i2c.c:
+
+	- Syncrhronized with linux-2.6.12-rc6-mm1.
+	- Should compile cleanly with linux-2.6.11 also.
+
+	* Makefile:
+
+	- make snapshot now puts also ChangeLog-date at snapshot directory.
+
 2005-06-10 10:52 mchehab
 	* tuner-core.c:
 
diff --git a/v4l/Makefile b/v4l/Makefile
index 800811a40..ea4e3ca0c 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -151,6 +151,7 @@ release: clean
 snapshot snap tarball: clean
 	echo $(date) > .snapshot
 	(cd ..; tar czf $(snapdir)/$(snap)-$(date).tar.gz $(thisdir))
+	cp ChangeLog /$(snapdir)/ChangeLog-$(date)
 	$(MAKE) -C $(snapdir)