- Second round of i2c IDs redefinition cleanup.

        Signed-off-by: Jean Delvare <khali@linux-fr.org>
        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

11 files changed, 2 insertions, 16 deletions

diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c
index 85f2e588a..30c0d3211 100644
--- a/linux/drivers/media/video/bt832.c
+++ b/linux/drivers/media/video/bt832.c
@@ -37,7 +37,6 @@
 #include "i2c-compat.h"
 #else
 #include <media/audiochip.h>
-#include <media/id.h>
 #endif
 #include "bttv.h"
 #include "bt832.h"
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 91b7204a1..7df31a1b2 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -57,7 +57,6 @@
 
 #include <linux/videodev.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "msp3400.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 91b7204a1..7df31a1b2 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -57,7 +57,6 @@
 
 #include <linux/videodev.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "msp3400.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c
index 2e69cb24c..2a4d54a63 100644
--- a/linux/drivers/media/video/saa6588.c
+++ b/linux/drivers/media/video/saa6588.c
@@ -32,7 +32,6 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-#include <media/id.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
 #endif
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 31a9ab494..2415ed63e 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -17,7 +17,6 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
 #endif
-#include <media/id.h>
 
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 5c0866970..659adf148 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.73 2005/10/23 17:46:42 mkrufky Exp $
+ * $Id: saa7134.h,v 1.74 2005/10/30 17:19:21 mchehab Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -36,7 +36,6 @@
 #include "compat.h"
 #include <media/tuner.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/video-buf.h>
diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c
index 017ba629d..c5b2fdfdf 100644
--- a/linux/drivers/media/video/tda7432.c
+++ b/linux/drivers/media/video/tda7432.c
@@ -55,7 +55,6 @@
 #include "i2c-compat.h"
 #else
 #include <media/audiochip.h>
-#include <media/id.h>
 #endif
 
 #ifndef VIDEO_AUDIO_BALANCE
diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c
index 79a659451..ddaaa2917 100644
--- a/linux/drivers/media/video/tda9875.c
+++ b/linux/drivers/media/video/tda9875.c
@@ -37,7 +37,6 @@
 #include "i2c-compat.h"
 #else
 #include <media/audiochip.h>
-#include <media/id.h>
 #endif
 
 static int debug; /* insmod parameter */
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index a80cbff9f..98e5657d6 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -15,7 +15,6 @@
 #endif
 #include <media/audiochip.h>
 #include <media/tuner.h>
-#include <media/id.h>
 
 
 /* Chips:
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index dea036b6d..9373a0a87 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -36,7 +36,6 @@
 #else
 #endif
 #include <media/audiochip.h>
-#include <media/id.h>
 
 #include "tvaudio.h"
 
@@ -1468,7 +1467,7 @@ static struct CHIPDESC chiplist[] = {
 	},
 	{
 		.name       = "pic16c54 (PV951)",
-		.id         = I2C_DRIVERID_PIC16C54_PV951,
+		.id         = I2C_DRIVERID_PIC16C54_PV9,
 		.insmodopt  = &pic16c54,
 		.addr_lo    = I2C_PIC16C54 >> 1,
 		.addr_hi    = I2C_PIC16C54>> 1,
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index c16e2c64b..3288cd7df 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -673,10 +673,6 @@ EXPORT_SYMBOL(tveeprom_read);
 /* run, just call the exported tveeprom_* directly, there is no point in   */
 /* using the indirect way via i2c_driver->command()                        */
 
-#ifndef I2C_DRIVERID_TVEEPROM
-# define I2C_DRIVERID_TVEEPROM I2C_DRIVERID_EXP2
-#endif
-
 static unsigned short normal_i2c[] = {
 	0xa0 >> 1,
 	I2C_CLIENT_END,