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/video/i810/i810-i2c.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/video/i810/i810-i2c.c')
| -rw-r--r-- | drivers/video/i810/i810-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c index c1f7b49975dd..7d06b38e80a0 100644 --- a/drivers/video/i810/i810-i2c.c +++ b/drivers/video/i810/i810-i2c.c | |||
| @@ -98,7 +98,6 @@ static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name) | |||
| 98 | chan->algo.getsda = i810i2c_getsda; | 98 | chan->algo.getsda = i810i2c_getsda; |
| 99 | chan->algo.getscl = i810i2c_getscl; | 99 | chan->algo.getscl = i810i2c_getscl; |
| 100 | chan->algo.udelay = 10; | 100 | chan->algo.udelay = 10; |
| 101 | chan->algo.mdelay = 10; | ||
| 102 | chan->algo.timeout = (HZ/2); | 101 | chan->algo.timeout = (HZ/2); |
| 103 | chan->algo.data = chan; | 102 | chan->algo.data = chan; |
| 104 | 103 | ||