summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-06-12 01:36:14 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-06-12 01:36:14 +0000
commitaf9281ddbde97a47a1476d7fb2a60eaf4781d738 (patch)
tree05fdf00f161b6b4e53326969e029ac5117c20e6f /linux/drivers/media/video/saa7134
parent502df9a802c518e57a4960a1fb5a0b0ed84c2fff (diff)
downloadmediapointer-dvb-s2-af9281ddbde97a47a1476d7fb2a60eaf4781d738.tar.gz
mediapointer-dvb-s2-af9281ddbde97a47a1476d7fb2a60eaf4781d738.tar.bz2
* tuner-core.c:
- Solved a problem when compiling with some versions of gcc - Solved a problem compiling without CONFIG_TUNER_MULTI_I2C - cx88-i2c.c, saa7134-i2c.c: - Make it compatible with kernel 2.6.12-rc6-mm1
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-i2c.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index 084d8c023..2a25a7524 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-i2c.c,v 1.10 2005/01/24 17:37:23 kraxel Exp $
+ * $Id: saa7134-i2c.c,v 1.11 2005/06/12 01:36:14 mchehab Exp $
*
* device driver for philips saa7134 based TV cards
* i2c interface support
@@ -238,7 +238,7 @@ static inline int i2c_recv_byte(struct saa7134_dev *dev)
}
static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
- struct i2c_msg msgs[], int num)
+ struct i2c_msg *msgs, int num)
{
struct saa7134_dev *dev = i2c_adap->algo_data;
enum i2c_status status;
@@ -361,7 +361,6 @@ static struct i2c_adapter saa7134_adap_template = {
static struct i2c_client saa7134_client_template = {
I2C_DEVNAME("saa7134 internal"),
- .id = -1,
};
/* ----------------------------------------------------------- */