diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/atm/eni.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/atm/eni.c')
| -rw-r--r-- | drivers/atm/eni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index df359a6c14f6..bc1b13c8f5d7 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -1488,7 +1488,7 @@ static void bug_int(struct atm_dev *dev,unsigned long reason) | |||
| 1488 | } | 1488 | } |
| 1489 | 1489 | ||
| 1490 | 1490 | ||
| 1491 | static irqreturn_t eni_int(int irq,void *dev_id,struct pt_regs *regs) | 1491 | static irqreturn_t eni_int(int irq,void *dev_id) |
| 1492 | { | 1492 | { |
| 1493 | struct atm_dev *dev; | 1493 | struct atm_dev *dev; |
| 1494 | struct eni_dev *eni_dev; | 1494 | struct eni_dev *eni_dev; |