diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9703d3d351f94309b651b49a53fa9ab2cdee1e6b..225fee93cfd4bc771df5ddb80fffd9073311da44 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -37,9 +37,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
-
 #include <asm/semaphore.h>
-
 #include <media/ir-common.h>
 
 /* Mark Phalan <phalanm@o2.ie> */
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 31a9797bd973c7eb4dfdb6cab0dc7fbae1e3b9de..5252a4ca3fd198f9112cce7ed2948ba478e2fe74 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -434,9 +434,9 @@ static int saa6588_probe(struct i2c_adapter *adap)
 		return i2c_probe(adap, &addr_data, saa6588_attach);
 #else
 	switch (adap->id) {
-	case I2C_ALGO_BIT | I2C_HW_B_BT848:
-	case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-	case I2C_ALGO_SAA7134:
+	case I2C_HW_B_BT848:
+	case I2C_HW_B_RIVA:
+	case I2C_HW_SAA7134:
 		return i2c_probe(adap, &addr_data, saa6588_attach);
 		break;
 	}