Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 3ae0f7660135148c813e2ad1cfd9682d90625508..5309608abfa83ccee478914146f90ba67e24d9b6 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -45,7 +45,6 @@
 #define I2C_DRIVERID_SAA7110   22      /* video decoder                */
 #define I2C_DRIVERID_SAA5249   24      /* SAA5249 and compatibles      */
 #define I2C_DRIVERID_PCF8583   25      /* real time clock              */
-#define I2C_DRIVERID_SAB3036   26      /* SAB3036 tuner                */
 #define I2C_DRIVERID_TDA7432   27      /* Stereo sound processor       */
 #define I2C_DRIVERID_TVMIXER    28      /* Mixer driver for tv cards    */
 #define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
@@ -68,7 +67,7 @@
 #define I2C_DRIVERID_WM8775    69      /* wm8775 audio processor       */
 #define I2C_DRIVERID_CS53L32A  70      /* cs53l32a audio processor     */
 #define I2C_DRIVERID_CX25840   71      /* cx2584x video encoder        */
-#define I2C_DRIVERID_SAA7127   72      /* saa7124 video encoder        */
+#define I2C_DRIVERID_SAA7127   72      /* saa7127 video encoder        */
 #define I2C_DRIVERID_SAA711X   73      /* saa711x video encoders       */
 #define I2C_DRIVERID_AKITAIOEXP        74      /* IO Expander on Sharp SL-C1000 */
 #define I2C_DRIVERID_INFRARED  75      /* I2C InfraRed on Video boards */