* dpl3518.c, msp3400-old.c, msp3400.c, saa6752hs.c, tda9887.c:

	* tuner-core.c, tvaudio.c, tveeprom.c:

	- Up requirement on kernel version to remove normal_i2c_range.
	  Actually it gives nothing, only remove unused static structure
	  so it's used as a reminder.

	- Fix compilation.

12 files changed, 26 insertions, 12 deletions

diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index a1ffae3c2..137795e03 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -148,7 +148,7 @@ static unsigned short normal_i2c[] = {
 	I2C_MSP3400C_ALT  >> 1,
 	I2C_CLIENT_END
 };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/msp3400-old.c b/linux/drivers/media/video/msp3400-old.c
index 2703b2c3d..63d964bba 100644
--- a/linux/drivers/media/video/msp3400-old.c
+++ b/linux/drivers/media/video/msp3400-old.c
@@ -153,7 +153,9 @@ static unsigned short normal_i2c[] = {
 	I2C_MSP3400C_ALT  >> 1,
 	I2C_CLIENT_END
 };
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
+#endif
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index a1ffae3c2..137795e03 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -148,7 +148,7 @@ static unsigned short normal_i2c[] = {
 	I2C_MSP3400C_ALT  >> 1,
 	I2C_CLIENT_END
 };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index 3671d9ee7..99fe221eb 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -28,7 +28,7 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 3671d9ee7..99fe221eb 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -28,7 +28,7 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 2f6ef2058..850d89b12 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -41,7 +41,7 @@ static unsigned short normal_i2c[] = {
 	0x96 >>1,
 	I2C_CLIENT_END,
 };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 390c450eb..15a8b8109 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.20 2005/06/18 05:20:46 nsh Exp $
+ * $Id: tuner-core.c,v 1.21 2005/06/18 06:00:36 nsh Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -37,7 +37,7 @@ static unsigned short normal_i2c[] = {
 	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 	I2C_CLIENT_END
 };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
@@ -142,6 +142,7 @@ static void set_freq(struct i2c_client *c, unsigned long freq)
 static void set_type(struct i2c_client *c, unsigned int type)
 {
 	struct tuner *t = i2c_get_clientdata(c);
+	unsigned char buffer[4];
 
 	tuner_dbg ("I2C addr 0x%02x with type %d\n",c->addr<<1,type);
 	/* sanity check */
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index 6e7823aeb..10d4284e1 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-simple.c,v 1.26 2005/06/18 05:20:46 nsh Exp $
+ * $Id: tuner-simple.c,v 1.27 2005/06/18 06:00:36 nsh Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -495,7 +495,6 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
 int default_tuner_init(struct i2c_client *c)
 {
 	struct tuner *t = i2c_get_clientdata(c);
-	unsigned char buffer[4];
 
 	tuner_info("type set to %d (%s)\n",
 		   t->type, tuners[t->type].name);
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index 8b5d24161..8f8bc73ff 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -154,7 +154,7 @@ static unsigned short normal_i2c[] = {
 	I2C_TDA9874   >> 1,
 	I2C_PIC16C54  >> 1,
 	I2C_CLIENT_END };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 I2C_CLIENT_INSMOD;
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index a7112ede0..b4720ed5b 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -483,7 +483,7 @@ static unsigned short normal_i2c[] = {
 	0xa0 >> 1,
 	I2C_CLIENT_END,
 };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 #endif
 
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 935d603a6..96e060859 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-18 09:46 nshmyrev
+	* dpl3518.c, msp3400-old.c, msp3400.c, saa6752hs.c, tda9887.c:
+	* tuner-core.c, tvaudio.c, tveeprom.c:
+
+	- Up requirement on kernel version to remove normal_i2c_range.
+	  Actually it gives nothing, only remove unused static structure
+	  so it's used as a reminder.
+	  
+	- Fix compilation.
+
 2005-06-18 09:06 nshmyrev
 	* tuner-core.c, tuner-simple.c, tda8290:
 	
diff --git a/v4l_experimental/dpl3518.c b/v4l_experimental/dpl3518.c
index 3ce052c53..5fb52b4b2 100644
--- a/v4l_experimental/dpl3518.c
+++ b/v4l_experimental/dpl3518.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dpl3518.c,v 1.3 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: dpl3518.c,v 1.4 2005/06/18 06:00:36 nsh Exp $
  *
  * programming the dpl3518a Dolby Pro Logic Processor
  *
@@ -60,7 +60,9 @@
 static unsigned short normal_i2c[] = {
 	I2C_DPL3518 >> 1,
 	I2C_CLIENT_END};
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
+#endif
 I2C_CLIENT_INSMOD;
 
 struct dpl3518 {