commit e2998e10a9ed47cb70a5be6207aa34b2f2f22c17
author Hans Verkuil <hverkuil@xs4all.nl> Tue Nov 08 21:38:49 2005 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Wed Nov 09 07:56:31 2005 -0800
tree bc75362099abaee8d6588406c8d2922d8082a21a
parent d6242f209984795644fb08b5410f405406c7104a

[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>

drivers/media/video/cs53l32a.c

diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 7434e5e..780b352 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_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)