git.openpandora.org
/
pandora-kernel.git
/ 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/gregkh/i2c-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-vp3054-i2c.c
diff --git
a/drivers/media/video/cx88/cx88-vp3054-i2c.c
b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index
751a754
..
2b4f197
100644
(file)
--- a/
drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/
drivers/media/video/cx88/cx88-vp3054-i2c.c
@@
-100,7
+100,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,
};