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/mchehab/v4l-dvb
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bt8xx
/
bttv-i2c.c
diff --git
a/drivers/media/video/bt8xx/bttv-i2c.c
b/drivers/media/video/bt8xx/bttv-i2c.c
index
03ee170
..
70de6c9
100644
(file)
--- a/
drivers/media/video/bt8xx/bttv-i2c.c
+++ b/
drivers/media/video/bt8xx/bttv-i2c.c
@@
-111,7
+111,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,
};