diff --git a/[refs] b/[refs] index 0c4931ce055c..51e661fef8eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f13df9195b2b4db874ba2d6bd1c2a09ea64d39e0 +refs/heads/master: a20c522498330ba0f4970a9bcd11890312277ae2 diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h index ec311bc89439..679b46a6a565 100644 --- a/trunk/include/linux/i2c-id.h +++ b/trunk/include/linux/i2c-id.h @@ -184,6 +184,7 @@ #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 */ /* --- PCF 8584 based algorithms */ #define I2C_HW_P_LP 0x020000 /* Parallel port interface */