diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/media/video/cx88/cx88-vp3054-i2c.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/video/cx88/cx88-vp3054-i2c.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-vp3054-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c index 751a754a45e9..2b4f1970c7df 100644 --- 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 = { | |||
| 100 | .getsda = vp3054_bit_getsda, | 100 | .getsda = vp3054_bit_getsda, |
| 101 | .getscl = vp3054_bit_getscl, | 101 | .getscl = vp3054_bit_getscl, |
| 102 | .udelay = 16, | 102 | .udelay = 16, |
| 103 | .mdelay = 10, | ||
| 104 | .timeout = 200, | 103 | .timeout = 200, |
| 105 | }; | 104 | }; |
| 106 | 105 | ||