diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/i2c/busses/i2c-prosavage.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/i2c/busses/i2c-prosavage.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-prosavage.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c index 9479525892e3..7745e21874a8 100644 --- a/drivers/i2c/busses/i2c-prosavage.c +++ b/drivers/i2c/busses/i2c-prosavage.c | |||
| @@ -180,7 +180,6 @@ static int i2c_register_bus(struct pci_dev *dev, struct s_i2c_bus *p, void __iom | |||
| 180 | p->algo.getsda = bit_s3via_getsda; | 180 | p->algo.getsda = bit_s3via_getsda; |
| 181 | p->algo.getscl = bit_s3via_getscl; | 181 | p->algo.getscl = bit_s3via_getscl; |
| 182 | p->algo.udelay = CYCLE_DELAY; | 182 | p->algo.udelay = CYCLE_DELAY; |
| 183 | p->algo.mdelay = CYCLE_DELAY; | ||
| 184 | p->algo.timeout = TIMEOUT; | 183 | p->algo.timeout = TIMEOUT; |
| 185 | p->algo.data = p; | 184 | p->algo.data = p; |
| 186 | p->mmvga = mmvga; | 185 | p->mmvga = mmvga; |