diff --git a/[refs] b/[refs]
index 8a4e5b1edfc3..c9f9469b07b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f61b48f7a838bb3d089b12fc9d03fd53c9ef5022
+refs/heads/master: 275511a0aca8483c03df1c6e3a33a27cee334709
diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h
index 4891e03ad23a..a271b67a8e2d 100644
--- a/trunk/include/linux/i2c-id.h
+++ b/trunk/include/linux/i2c-id.h
@@ -197,6 +197,7 @@
 #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 */
+#define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
 
 /* --- PCF 8584 based algorithms					*/
 #define I2C_HW_P_LP		0x020000 /* Parallel port interface */