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/firestream.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/atm/firestream.c')
| -rw-r--r-- | drivers/atm/firestream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 5f25e5efefcd..40ab9b65fae9 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -1546,7 +1546,7 @@ static void __devexit free_freepool (struct fs_dev *dev, struct freepool *fp) | |||
| 1546 | 1546 | ||
| 1547 | 1547 | ||
| 1548 | 1548 | ||
| 1549 | static irqreturn_t fs_irq (int irq, void *dev_id, struct pt_regs * pt_regs) | 1549 | static irqreturn_t fs_irq (int irq, void *dev_id) |
| 1550 | { | 1550 | { |
| 1551 | int i; | 1551 | int i; |
| 1552 | u32 status; | 1552 | u32 status; |