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/parisc/gsc.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/parisc/gsc.h')
| -rw-r--r-- | drivers/parisc/gsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/gsc.h b/drivers/parisc/gsc.h index a3dc456709d7..762a1babad60 100644 --- a/drivers/parisc/gsc.h +++ b/drivers/parisc/gsc.h | |||
| @@ -44,4 +44,4 @@ void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl, | |||
| 44 | void (*choose)(struct parisc_device *child, void *ctrl)); | 44 | void (*choose)(struct parisc_device *child, void *ctrl)); |
| 45 | void gsc_asic_assign_irq(struct gsc_asic *asic, int local_irq, int *irqp); | 45 | void gsc_asic_assign_irq(struct gsc_asic *asic, int local_irq, int *irqp); |
| 46 | 46 | ||
| 47 | irqreturn_t gsc_asic_intr(int irq, void *dev, struct pt_regs *regs); | 47 | irqreturn_t gsc_asic_intr(int irq, void *dev); |