[PATCH] V4L: 915: fixes compilation problems due removal of media/id.h and i2c-algo-bit

Fixes compilation problems due removal of media/id.h and I2C_ALGO_BIT

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 12 insertions, 10 deletions

diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 7434e5e66d59..780b352ec119 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -25,9 +25,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
+#include <linux/i2c-id.h>
 #include <linux/videodev.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 
 MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
 MODULE_AUTHOR("Martin Vaughan");
@@ -190,7 +190,13 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
 
 static int cs53l32a_probe(struct i2c_adapter *adapter)
 {
-        return i2c_probe(adapter, &addr_data, cs53l32a_attach);
+#ifdef I2C_CLASS_TV_ANALOG
+        if (adapter->class & I2C_CLASS_TV_ANALOG)
+#else
+        if (adapter->id == I2C_HW_B_BT848)
+#endif
+                return i2c_probe(adapter, &addr_data, cs53l32a_attach);
+        return 0;
 }
 
 static int cs53l32a_detach(struct i2c_client *client)
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 7d90ae5a99bc..22f286222004 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -26,9 +26,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
+#include <linux/i2c-id.h>
 #include <linux/videodev.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 
 MODULE_DESCRIPTION("wm8775 driver");
 MODULE_AUTHOR("Ulf Eklund");
@@ -204,14 +204,10 @@ static int wm8775_probe(struct i2c_adapter *adapter)
 {
 #ifdef I2C_CLASS_TV_ANALOG
         if (adapter->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adapter, &addr_data, wm8775_attach);
 #else
-        switch (adapter->id) {
-        case I2C_HW_B_BT848:
-                return i2c_probe(adapter, &addr_data, tda9887_attach);
-        }
-#endif /* I2C_CLASS_TV_ANALOG */
-
+        if (adapter->id == I2C_HW_B_BT848)
+#endif
+                return i2c_probe(adapter, &addr_data, wm8775_attach);
         return 0;
 }