Merge linux-2.6 with linux-acpi-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93f..b3f4d266cede 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
         DDEBUG(4, &c->dev, "entered");
 
         switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                 rc = ov_write_regvals(c, regvals_init_6x20_511);
                 break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                 rc = ov_write_regvals(c, regvals_init_6x20_518);
                 break;
         default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                 if (win->format == VIDEO_PALETTE_GREY)
                         ov_write_mask(c, 0x13, 0x00, 0x20);
                 else