aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cafe_ccic.c1
-rw-r--r--drivers/media/video/ov7670.c1
-rw-r--r--drivers/media/video/ovcamchip/ovcamchip_core.c1
-rw-r--r--drivers/media/video/w9968cf.c1
-rw-r--r--include/linux/i2c.h1
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 34a39d2e4703..46fd573a4f15 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -569,7 +569,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
569 569
570 cafe_smbus_enable_irq(cam); 570 cafe_smbus_enable_irq(cam);
571 adap->id = I2C_HW_SMBUS_CAFE; 571 adap->id = I2C_HW_SMBUS_CAFE;
572 adap->class = I2C_CLASS_CAM_DIGITAL;
573 adap->owner = THIS_MODULE; 572 adap->owner = THIS_MODULE;
574 adap->client_register = cafe_smbus_attach; 573 adap->client_register = cafe_smbus_attach;
575 adap->client_unregister = cafe_smbus_detach; 574 adap->client_unregister = cafe_smbus_detach;
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index ca26b0c50cf2..05c14a29375a 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -1347,7 +1347,6 @@ static struct i2c_driver ov7670_driver = {
1347 .name = "ov7670", 1347 .name = "ov7670",
1348 }, 1348 },
1349 .id = I2C_DRIVERID_OV7670, 1349 .id = I2C_DRIVERID_OV7670,
1350 .class = I2C_CLASS_CAM_DIGITAL,
1351 .attach_adapter = ov7670_attach, 1350 .attach_adapter = ov7670_attach,
1352 .detach_client = ov7670_detach, 1351 .detach_client = ov7670_detach,
1353 .command = ov7670_command, 1352 .command = ov7670_command,
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2c4acbf5a4fe..c841f4e4fbe4 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -405,7 +405,6 @@ static struct i2c_driver driver = {
405 .name = "ovcamchip", 405 .name = "ovcamchip",
406 }, 406 },
407 .id = I2C_DRIVERID_OVCAMCHIP, 407 .id = I2C_DRIVERID_OVCAMCHIP,
408 .class = I2C_CLASS_CAM_DIGITAL,
409 .attach_adapter = ovcamchip_attach, 408 .attach_adapter = ovcamchip_attach,
410 .detach_client = ovcamchip_detach, 409 .detach_client = ovcamchip_detach,
411 .command = ovcamchip_command, 410 .command = ovcamchip_command,
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index a3997b7d4366..105a832531f2 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -1553,7 +1553,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
1553 1553
1554 static struct i2c_adapter adap = { 1554 static struct i2c_adapter adap = {
1555 .id = I2C_HW_SMBUS_W9968CF, 1555 .id = I2C_HW_SMBUS_W9968CF,
1556 .class = I2C_CLASS_CAM_DIGITAL,
1557 .owner = THIS_MODULE, 1556 .owner = THIS_MODULE,
1558 .client_register = w9968cf_i2c_attach_inform, 1557 .client_register = w9968cf_i2c_attach_inform,
1559 .client_unregister = w9968cf_i2c_detach_inform, 1558 .client_unregister = w9968cf_i2c_detach_inform,
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4fd79d2e4021..20873d402467 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -393,7 +393,6 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
393#define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */ 393#define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */
394#define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */ 394#define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */
395#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */ 395#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */
396#define I2C_CLASS_CAM_DIGITAL (1<<5) /* most webcams */
397#define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */ 396#define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */
398 397
399/* i2c_client_address_data is the struct for holding default client 398/* i2c_client_address_data is the struct for holding default client