Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[net-next-2.6.git] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index cce6074dd754d7af42699f55fe6baa2bcc4a15be..0a8f750cbede9e9c963515ca09e60f121081c05e 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -112,6 +112,10 @@
 #define I2C_DRIVERID_X1205     82      /* Xicor/Intersil X1205 RTC     */
 #define I2C_DRIVERID_PCF8563   83      /* Philips PCF8563 RTC          */
 #define I2C_DRIVERID_RS5C372   84      /* Ricoh RS5C372 RTC            */
+#define I2C_DRIVERID_BT866     85      /* Conexant bt866 video encoder */
+#define I2C_DRIVERID_KS0127    86      /* Samsung ks0127 video decoder */
+#define I2C_DRIVERID_TLV320AIC23B 87   /* TI TLV320AIC23B audio codec  */
+#define I2C_DRIVERID_ISL1208   88      /* Intersil ISL1208 RTC         */
 
 #define I2C_DRIVERID_I2CDEV    900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */