diff options
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-i2c.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c index 24eebd4a3..5ed24c23a 100644 --- a/linux/drivers/media/video/em28xx/em28xx-i2c.c +++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c @@ -465,7 +465,9 @@ static struct i2c_adapter em28xx_adap_template = { .class = I2C_CLASS_TV_ANALOG, #endif .name = "em28xx", +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) .id = I2C_HW_B_EM28XX, +#endif .algo = &em28xx_algo, }; @@ -489,7 +491,7 @@ static char *i2c_devs[128] = { [0xa0 >> 1] = "eeprom", [0xb0 >> 1] = "tda9874", [0xb8 >> 1] = "tvp5150a", - [0xba >> 1] = "tvp5150a", + [0xba >> 1] = "webcam sensor or tvp5150a", [0xc0 >> 1] = "tuner (analog)", [0xc2 >> 1] = "tuner (analog)", [0xc4 >> 1] = "tuner (analog)", |