Merge linux-2.6 with linux-acpi-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f9..255b6088ebf9 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda7432_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, tda7432_attach);
 #endif
         return 0;
@@ -513,7 +513,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda7432"),
+        .name       = "tda7432",
         .driver     = &driver,
 };