* tuner-core.c:

        - Solved a problem when compiling with some versions of gcc

        - Solved a problem compiling without CONFIG_TUNER_MULTI_I2C

        - cx88-i2c.c, saa7134-i2c.c:

        - Make it compatible with kernel 2.6.12-rc6-mm1

3 files changed, 7 insertions, 9 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 012ab1c5b..39e14d509 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-i2c.c,v 1.21 2005/06/08 01:28:09 mchehab Exp $
+    $Id: cx88-i2c.c,v 1.22 2005/06/12 01:36:14 mchehab Exp $
 
     cx88-i2c.c  --  all the i2c code is here
 
@@ -154,7 +154,6 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 
 static struct i2c_client cx8800_i2c_client_template = {
         I2C_DEVNAME("cx88xx internal"),
-        .id   = -1,
 };
 
 static char *i2c_devs[128] = {
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index 084d8c023..2a25a7524 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-i2c.c,v 1.10 2005/01/24 17:37:23 kraxel Exp $
+ * $Id: saa7134-i2c.c,v 1.11 2005/06/12 01:36:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
@@ -238,7 +238,7 @@ static inline int i2c_recv_byte(struct saa7134_dev *dev)
 }
 
 static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
-			    struct i2c_msg msgs[], int num)
+			    struct i2c_msg *msgs, int num)
 {
 	struct saa7134_dev *dev = i2c_adap->algo_data;
 	enum i2c_status status;
@@ -361,7 +361,6 @@ static struct i2c_adapter saa7134_adap_template = {
 
 static struct i2c_client saa7134_client_template = {
 	I2C_DEVNAME("saa7134 internal"),
-        .id        = -1,
 };
 
 /* ----------------------------------------------------------- */
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 1033b74ae..64fbf1fd4 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.14 2005/06/10 10:57:18 mchehab Exp $
+ * $Id: tuner-core.c,v 1.15 2005/06/12 01:36:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -219,8 +219,8 @@ static void set_type(struct i2c_client *c, unsigned int type)
 		 	CHECK_ADDR(radio_tuner,cmd,"radio") } else \
 			{ CHECK_ADDR(tv_tuner,cmd,"TV"); }
 #else
-#define CHECK_ADDR(tp,cmd,tun) tuner_info ("Cmd %s accepted to %s".\n",cmd,tun);
-#define CHECK_MODE(cmd) tuner_info ("Cmd %s accepted".\n",cmd);
+#define CHECK_ADDR(tp,cmd,tun) tuner_info ("Cmd %s accepted to "tun"\n",cmd);
+#define CHECK_MODE(cmd) tuner_info ("Cmd %s accepted\n",cmd);
 #endif
 
 #ifdef CONFIG_TUNER_MULTI_I2C
@@ -255,7 +255,7 @@ static void set_addr(struct i2c_client *c, struct tuner_addr *tun_addr)
 	set_type(c,tun_addr->type);
 }
 #else
-#define set_addr(c,tun_addr) set_type(c,tun_addr->type)
+#define set_addr(c,tun_addr) set_type(c,(tun_addr)->type)
 #endif
 
 static char pal[] = "-";