diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-07-10 10:04:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:18:34 -0400 |
commit | be99af6679174e5d0e9f36fc8c18318a8ce34bca (patch) | |
tree | 026e0692008dc852203ae7e9dff06575cf97bb3f | |
parent | e2fc00c21124d9d9a8d4f396e5498ea27ddfc8fd (diff) |
V4L/DVB (8245): ovcamchip: Delete stray I2C bus ID
I2C_HW_SMBUS_OVFX2 is referenced in ovcamchip_core.c, but no bus uses
this driver ID, so we can remove the reference. As far as I can see,
the Cypress FX2 webcam is handled by a different driver (dvb-usb).
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/ovcamchip/ovcamchip_core.c | 1 | ||||
-rw-r--r-- | include/linux/i2c-id.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c index 8063e33f1c85..065c2454113e 100644 --- a/drivers/media/video/ovcamchip/ovcamchip_core.c +++ b/drivers/media/video/ovcamchip/ovcamchip_core.c | |||
@@ -297,7 +297,6 @@ static int ovcamchip_attach(struct i2c_adapter *adap) | |||
297 | switch (adap->id) { | 297 | switch (adap->id) { |
298 | case I2C_HW_SMBUS_OV511: | 298 | case I2C_HW_SMBUS_OV511: |
299 | case I2C_HW_SMBUS_OV518: | 299 | case I2C_HW_SMBUS_OV518: |
300 | case I2C_HW_SMBUS_OVFX2: | ||
301 | case I2C_HW_SMBUS_W9968CF: | 300 | case I2C_HW_SMBUS_W9968CF: |
302 | PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id); | 301 | PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id); |
303 | break; | 302 | break; |
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index ef13b7c66df3..9083847157a3 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -158,7 +158,6 @@ | |||
158 | #define I2C_HW_SMBUS_W9968CF 0x04000d | 158 | #define I2C_HW_SMBUS_W9968CF 0x04000d |
159 | #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ | 159 | #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ |
160 | #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ | 160 | #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ |
161 | #define I2C_HW_SMBUS_OVFX2 0x040011 /* Cypress/OmniVision FX2 webcam */ | ||
162 | #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ | 161 | #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ |
163 | #define I2C_HW_SMBUS_ALI1563 0x040013 | 162 | #define I2C_HW_SMBUS_ALI1563 0x040013 |
164 | 163 | ||