diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/i2c-id.h | 7 | ||||
-rw-r--r-- | include/media/id.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 5b72f664cc21..d044e738d383 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -245,6 +245,9 @@ | |||
245 | #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ | 245 | #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ |
246 | #define I2C_HW_B_PCILYNX 0x01001a /* TI PCILynx I2C adapter */ | 246 | #define I2C_HW_B_PCILYNX 0x01001a /* TI PCILynx I2C adapter */ |
247 | #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ | 247 | #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ |
248 | #define I2C_HW_B_NVIDIA 0x01001c /* nvidia framebuffer driver */ | ||
249 | #define I2C_HW_B_SAVAGE 0x01001d /* savage framebuffer driver */ | ||
250 | #define I2C_HW_B_RADEON 0x01001e /* radeon framebuffer driver */ | ||
248 | 251 | ||
249 | /* --- PCF 8584 based algorithms */ | 252 | /* --- PCF 8584 based algorithms */ |
250 | #define I2C_HW_P_LP 0x020000 /* Parallel port interface */ | 253 | #define I2C_HW_P_LP 0x020000 /* Parallel port interface */ |
@@ -317,4 +320,8 @@ | |||
317 | /* --- Marvell mv64xxx i2c adapter */ | 320 | /* --- Marvell mv64xxx i2c adapter */ |
318 | #define I2C_HW_MV64XXX 0x190000 | 321 | #define I2C_HW_MV64XXX 0x190000 |
319 | 322 | ||
323 | /* --- Miscellaneous adapters */ | ||
324 | #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ | ||
325 | #define I2C_HW_SAA7134 0x090000 /* SAA7134 video decoder bus */ | ||
326 | |||
320 | #endif /* LINUX_I2C_ID_H */ | 327 | #endif /* LINUX_I2C_ID_H */ |
diff --git a/include/media/id.h b/include/media/id.h index a39a6423914b..801ddef301aa 100644 --- a/include/media/id.h +++ b/include/media/id.h | |||
@@ -34,8 +34,3 @@ | |||
34 | #ifndef I2C_DRIVERID_SAA6752HS | 34 | #ifndef I2C_DRIVERID_SAA6752HS |
35 | # define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8 | 35 | # define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8 |
36 | #endif | 36 | #endif |
37 | |||
38 | /* algorithms */ | ||
39 | #ifndef I2C_ALGO_SAA7134 | ||
40 | # define I2C_ALGO_SAA7134 0x090000 | ||
41 | #endif | ||