diff --git a/[refs] b/[refs] index c721a9a276c1..e595f215f3b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f80d0d23f2010b7682e06449345e8199a2b2619c +refs/heads/master: c37bb26654bb8981ea237076e333eb37d4aa2dc6 diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h index c8b81f419fd8..cce6074dd754 100644 --- a/trunk/include/linux/i2c-id.h +++ b/trunk/include/linux/i2c-id.h @@ -189,6 +189,7 @@ #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 */