7 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index c2f32d522668..feccf08bc0e3 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -432,7 +432,7 @@ static int ir_probe(struct i2c_adapter *adap)
         case I2C_HW_B_BT848:
                 probe = probe_bttv;
                 break;
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                 probe = probe_saa7134;
                 break;
         }
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 0bb1073d94bd..238ac3fdeb4a 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -381,7 +381,7 @@ static struct i2c_adapter saa7134_adap_template = {
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
         I2C_DEVNAME("saa7134"),
-        .id            = I2C_ALGO_SAA7134,
+        .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
         .client_register = attach_inform,
 };
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index c29bdfc3244e..c0594e09d63e 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -205,7 +205,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index f1b1bb5acf70..abb96ce464c7 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -620,7 +620,7 @@ static int tda9887_probe(struct i2c_adapter *adap)
         switch (adap->id) {
         case I2C_HW_B_BT848:
         case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, tda9887_attach);
                 break;
         }
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index b44db8a7b94d..8334d6ccd0a0 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -86,7 +86,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 48d4db7d507b..9d09d2d23c2e 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 9420b5f52915..f6aab89593ea 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1548,7 +1548,7 @@ static int chip_probe(struct i2c_adapter *adap)
 {
         /* don't attach on saa7146 based cards,
            because dedicated drivers are used */
-        if ((adap->id & I2C_ALGO_SAA7146))
+        if (adap->id == I2C_HW_SAA7146)
                 return 0;
 #ifdef I2C_CLASS_TV_ANALOG
         if (adap->class & I2C_CLASS_TV_ANALOG)
@@ -1557,7 +1557,7 @@ static int chip_probe(struct i2c_adapter *adap)
         switch (adap->id) {
         case I2C_HW_B_BT848:
         case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, chip_attach);
         }
 #endif