diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/video/savage/savagefb-i2c.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/video/savage/savagefb-i2c.c')
| -rw-r--r-- | drivers/video/savage/savagefb-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c index e83befd16d63..d7d810dbf0bd 100644 --- a/drivers/video/savage/savagefb-i2c.c +++ b/drivers/video/savage/savagefb-i2c.c | |||
| @@ -148,7 +148,6 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan, | |||
| 148 | chan->adapter.algo_data = &chan->algo; | 148 | chan->adapter.algo_data = &chan->algo; |
| 149 | chan->adapter.dev.parent = &chan->par->pcidev->dev; | 149 | chan->adapter.dev.parent = &chan->par->pcidev->dev; |
| 150 | chan->algo.udelay = 40; | 150 | chan->algo.udelay = 40; |
| 151 | chan->algo.mdelay = 5; | ||
| 152 | chan->algo.timeout = 20; | 151 | chan->algo.timeout = 20; |
| 153 | chan->algo.data = chan; | 152 | chan->algo.data = chan; |
| 154 | 153 | ||