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/ieee1394/pcilynx.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/ieee1394/pcilynx.c')
| -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 | ||