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/ieee1394 | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index e6f41238f5e8..b4f146f2c951 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
| @@ -137,7 +137,6 @@ static struct i2c_algo_bit_data bit_data = { | |||
| 137 | .getsda = bit_getsda, | 137 | .getsda = bit_getsda, |
| 138 | .getscl = bit_getscl, | 138 | .getscl = bit_getscl, |
| 139 | .udelay = 5, | 139 | .udelay = 5, |
| 140 | .mdelay = 5, | ||
| 141 | .timeout = 100, | 140 | .timeout = 100, |
| 142 | }; | 141 | }; |
| 143 | 142 | ||