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/i2c/busses/i2c-hydra.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/i2c/busses/i2c-hydra.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-hydra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c index e0cb3b0f92fa..457d48a0ab9d 100644 --- a/drivers/i2c/busses/i2c-hydra.c +++ b/drivers/i2c/busses/i2c-hydra.c | |||
| @@ -99,7 +99,6 @@ static struct i2c_algo_bit_data hydra_bit_data = { | |||
| 99 | .getsda = hydra_bit_getsda, | 99 | .getsda = hydra_bit_getsda, |
| 100 | .getscl = hydra_bit_getscl, | 100 | .getscl = hydra_bit_getscl, |
| 101 | .udelay = 5, | 101 | .udelay = 5, |
| 102 | .mdelay = 5, | ||
| 103 | .timeout = HZ | 102 | .timeout = HZ |
| 104 | }; | 103 | }; |
| 105 | 104 | ||