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/ide/ide-io.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ba6039b55b41..2614f41b5074 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -1562,7 +1562,7 @@ static void unexpected_intr (int irq, ide_hwgroup_t *hwgroup) | |||
| 1562 | * on the hwgroup and the process begins again. | 1562 | * on the hwgroup and the process begins again. |
| 1563 | */ | 1563 | */ |
| 1564 | 1564 | ||
| 1565 | irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs) | 1565 | irqreturn_t ide_intr (int irq, void *dev_id) |
| 1566 | { | 1566 | { |
| 1567 | unsigned long flags; | 1567 | unsigned long flags; |
| 1568 | ide_hwgroup_t *hwgroup = (ide_hwgroup_t *)dev_id; | 1568 | ide_hwgroup_t *hwgroup = (ide_hwgroup_t *)dev_id; |