Commit e2998e10 authored by Hans Verkuil's avatar Hans Verkuil Committed by Linus Torvalds
Browse files

[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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d6242f20
......@@ -77,6 +77,6 @@
76 -> SKNet MonsterTV Mobile [1131:4ee9]
77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e]
78 -> ASUSTeK P7131 Dual [1043:4862]
79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B)
79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
80 -> ASUS Digimatrix TV [1043:0210]
81 -> Philips Tiger reference design [1131:2018]
......@@ -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)
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment