git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
cx88
/
cx88-i2c.c
diff --git
a/drivers/media/video/cx88/cx88-i2c.c
b/drivers/media/video/cx88/cx88-i2c.c
index
a74ed63
..
27b5dbb
100644
(file)
--- a/
drivers/media/video/cx88/cx88-i2c.c
+++ b/
drivers/media/video/cx88/cx88-i2c.c
@@
-163,7
+163,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,
};