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

[pandora-kernel.git] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 474c8f4..0a8f750 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -108,6 +108,14 @@
 #define I2C_DRIVERID_UPD64083  78      /* upd64083 video processor     */
 #define I2C_DRIVERID_UPD64031A 79      /* upd64031a video processor    */
 #define I2C_DRIVERID_SAA717X   80      /* saa717x video encoder        */
+#define I2C_DRIVERID_DS1672    81      /* Dallas/Maxim DS1672 RTC      */
+#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              */
@@ -172,7 +180,6 @@
 #define I2C_HW_B_RIVA          0x010010 /* Riva based graphics cards */
 #define I2C_HW_B_IOC           0x010011 /* IOC bit-wiggling */
 #define I2C_HW_B_TSUNA         0x010012 /* DEC Tsunami chipset */
-#define I2C_HW_B_FRODO         0x010013 /* 2d3D SA-1110 Development Board */
 #define I2C_HW_B_OMAHA         0x010014 /* Omaha I2C interface (ARM) */
 #define I2C_HW_B_GUIDE         0x010015 /* Guide bit-basher */
 #define I2C_HW_B_IXP2000       0x010016 /* GPIO on IXP2000 systems */
@@ -185,6 +192,8 @@
 #define I2C_HW_B_SAVAGE                0x01001d /* savage framebuffer driver */
 #define I2C_HW_B_RADEON                0x01001e /* radeon framebuffer driver */
 #define I2C_HW_B_EM28XX                0x01001f /* em28xx video capture cards */
+#define I2C_HW_B_CX2341X       0x010020 /* Conexant CX2341X MPEG encoder cards */
+#define I2C_HW_B_INTELFB       0x010021 /* intel framebuffer driver */
 
 /* --- PCF 8584 based algorithms                                       */
 #define I2C_HW_P_LP            0x020000 /* Parallel port interface */