[PATCH] proc_mkdir() should be used to create procfs directories
[safe/jmp/linux-2.6] / drivers / media / video / bt832.c
index a070417..76c1b63 100644 (file)
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-       if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+       if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
        return 0;
@@ -241,7 +241,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-       I2C_DEVNAME("bt832"),
+       .name       = "bt832",
        .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };