aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2005-11-09 00:38:49 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:31 -0500
commite2998e10a9ed47cb70a5be6207aa34b2f2f22c17 (patch)
treebc75362099abaee8d6588406c8d2922d8082a21a /drivers
parentd6242f209984795644fb08b5410f405406c7104a (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cs53l32a.c10
-rw-r--r--drivers/media/video/wm8775.c12
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 @@
25#include <linux/ioctl.h> 25#include <linux/ioctl.h>
26#include <asm/uaccess.h> 26#include <asm/uaccess.h>
27#include <linux/i2c.h> 27#include <linux/i2c.h>
28#include <linux/i2c-id.h>
28#include <linux/videodev.h> 29#include <linux/videodev.h>
29#include <media/audiochip.h> 30#include <media/audiochip.h>
30#include <media/id.h>
31 31
32MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC"); 32MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
33MODULE_AUTHOR("Martin Vaughan"); 33MODULE_AUTHOR("Martin Vaughan");
@@ -190,7 +190,13 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
190 190
191static int cs53l32a_probe(struct i2c_adapter *adapter) 191static int cs53l32a_probe(struct i2c_adapter *adapter)
192{ 192{
193 return i2c_probe(adapter, &addr_data, cs53l32a_attach); 193#ifdef I2C_CLASS_TV_ANALOG
194 if (adapter->class & I2C_CLASS_TV_ANALOG)
195#else
196 if (adapter->id == I2C_HW_B_BT848)
197#endif
198 return i2c_probe(adapter, &addr_data, cs53l32a_attach);
199 return 0;
194} 200}
195 201
196static int cs53l32a_detach(struct i2c_client *client) 202static 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 @@
26#include <linux/ioctl.h> 26#include <linux/ioctl.h>
27#include <asm/uaccess.h> 27#include <asm/uaccess.h>
28#include <linux/i2c.h> 28#include <linux/i2c.h>
29#include <linux/i2c-id.h>
29#include <linux/videodev.h> 30#include <linux/videodev.h>
30#include <media/audiochip.h> 31#include <media/audiochip.h>
31#include <media/id.h>
32 32
33MODULE_DESCRIPTION("wm8775 driver"); 33MODULE_DESCRIPTION("wm8775 driver");
34MODULE_AUTHOR("Ulf Eklund"); 34MODULE_AUTHOR("Ulf Eklund");
@@ -204,14 +204,10 @@ static int wm8775_probe(struct i2c_adapter *adapter)
204{ 204{
205#ifdef I2C_CLASS_TV_ANALOG 205#ifdef I2C_CLASS_TV_ANALOG
206 if (adapter->class & I2C_CLASS_TV_ANALOG) 206 if (adapter->class & I2C_CLASS_TV_ANALOG)
207 return i2c_probe(adapter, &addr_data, wm8775_attach);
208#else 207#else
209 switch (adapter->id) { 208 if (adapter->id == I2C_HW_B_BT848)
210 case I2C_HW_B_BT848: 209#endif
211 return i2c_probe(adapter, &addr_data, tda9887_attach); 210 return i2c_probe(adapter, &addr_data, wm8775_attach);
212 }
213#endif /* I2C_CLASS_TV_ANALOG */
214
215 return 0; 211 return 0;
216} 212}
217 213