diff options
Diffstat (limited to 'drivers/ieee1394/pcilynx.c')
-rw-r--r-- | drivers/ieee1394/pcilynx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index e6f41238f5e8..0a7412e27eb4 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 | ||
@@ -840,8 +839,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg) | |||
840 | ********************************************************/ | 839 | ********************************************************/ |
841 | 840 | ||
842 | 841 | ||
843 | static irqreturn_t lynx_irq_handler(int irq, void *dev_id, | 842 | static irqreturn_t lynx_irq_handler(int irq, void *dev_id) |
844 | struct pt_regs *regs_are_unused) | ||
845 | { | 843 | { |
846 | struct ti_lynx *lynx = (struct ti_lynx *)dev_id; | 844 | struct ti_lynx *lynx = (struct ti_lynx *)dev_id; |
847 | struct hpsb_host *host = lynx->host; | 845 | struct hpsb_host *host = lynx->host; |