summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-10-04 10:24:55 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-04 10:24:55 -0300
commitf38b1e7369a00cdc396109a0fe81ec05eb7af03d (patch)
tree87996adffa3914039795f5ede70223eadbacb764
parentf106aa84891b69e72192532635789eca94094c59 (diff)
downloadmediapointer-dvb-s2-f38b1e7369a00cdc396109a0fe81ec05eb7af03d.tar.gz
mediapointer-dvb-s2-f38b1e7369a00cdc396109a0fe81ec05eb7af03d.tar.bz2
i2c-algo-bit: Discard the mdelay data struct member
From: Mauro Carvalho Chehab <mchehab@infradead.org> Apply the rellevant parts from i2c-algo-bit: Discard the mdelay data struct member, from Jean Delvare <khali@linux-fr.org>, that applies to V4L/DVB tree. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-i2c.c1
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c1
-rw-r--r--linux/drivers/media/video/cx88/cx88-vp3054-i2c.c1
-rw-r--r--linux/drivers/media/video/zoran_card.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c
index a4b9e9f81..7a3da391d 100644
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c
@@ -113,7 +113,6 @@ static struct i2c_algo_bit_data bttv_i2c_algo_bit_template = {
.getsda = bttv_bit_getsda,
.getscl = bttv_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 672747a5f..da24a0a56 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -174,7 +174,6 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
.getsda = cx8800_bit_getsda,
.getscl = cx8800_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
diff --git a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 504a02215..e9dd18827 100644
--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -104,7 +104,6 @@ static struct i2c_algo_bit_data vp3054_i2c_algo_template = {
.getsda = vp3054_bit_getsda,
.getscl = vp3054_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
diff --git a/linux/drivers/media/video/zoran_card.c b/linux/drivers/media/video/zoran_card.c
index e54a21d71..cbd046a3a 100644
--- a/linux/drivers/media/video/zoran_card.c
+++ b/linux/drivers/media/video/zoran_card.c
@@ -823,7 +823,6 @@ static struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
.getsda = zoran_i2c_getsda,
.getscl = zoran_i2c_getscl,
.udelay = 10,
- .mdelay = 0,
.timeout = 100,
};