diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
commit | 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 (patch) | |
tree | d3057d468d36664d1accf964e76f6d97a299b40d /arch/sh/cchips | |
parent | a700f3594d63a85af196ac64984f7375d903afad (diff) |
sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/cchips')
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64461/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64465/gpio.c | 2 | ||||
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64465/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/cchips/voyagergx/irq.c | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c index 38f1e8171a3a..4d49b5cbcc13 100644 --- a/arch/sh/cchips/hd6446x/hd64461/setup.c +++ b/arch/sh/cchips/hd6446x/hd64461/setup.c | |||
@@ -71,7 +71,7 @@ static struct hw_interrupt_type hd64461_irq_type = { | |||
71 | .end = end_hd64461_irq, | 71 | .end = end_hd64461_irq, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static irqreturn_t hd64461_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 74 | static irqreturn_t hd64461_interrupt(int irq, void *dev_id) |
75 | { | 75 | { |
76 | printk(KERN_INFO | 76 | printk(KERN_INFO |
77 | "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", | 77 | "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", |
diff --git a/arch/sh/cchips/hd6446x/hd64465/gpio.c b/arch/sh/cchips/hd6446x/hd64465/gpio.c index 72320d02d69a..43431855ec86 100644 --- a/arch/sh/cchips/hd6446x/hd64465/gpio.c +++ b/arch/sh/cchips/hd6446x/hd64465/gpio.c | |||
@@ -85,7 +85,7 @@ static struct { | |||
85 | void *dev; | 85 | void *dev; |
86 | } handlers[GPIO_NPORTS * 8]; | 86 | } handlers[GPIO_NPORTS * 8]; |
87 | 87 | ||
88 | static irqreturn_t hd64465_gpio_interrupt(int irq, void *dev, struct pt_regs *regs) | 88 | static irqreturn_t hd64465_gpio_interrupt(int irq, void *dev) |
89 | { | 89 | { |
90 | unsigned short port, pin, isr, mask, portpin; | 90 | unsigned short port, pin, isr, mask, portpin; |
91 | 91 | ||
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c index 30573d3e1966..d126e1f30dee 100644 --- a/arch/sh/cchips/hd6446x/hd64465/setup.c +++ b/arch/sh/cchips/hd6446x/hd64465/setup.c | |||
@@ -84,7 +84,7 @@ static struct hw_interrupt_type hd64465_irq_type = { | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | 86 | ||
87 | static irqreturn_t hd64465_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 87 | static irqreturn_t hd64465_interrupt(int irq, void *dev_id) |
88 | { | 88 | { |
89 | printk(KERN_INFO | 89 | printk(KERN_INFO |
90 | "HD64465: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", | 90 | "HD64465: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", |
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index 392c8b12ce36..bf1b28feca06 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c | |||
@@ -88,8 +88,7 @@ static struct hw_interrupt_type voyagergx_irq_type = { | |||
88 | .end = end_voyagergx_irq, | 88 | .end = end_voyagergx_irq, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, | 91 | static irqreturn_t voyagergx_interrupt(int irq, void *dev_id) |
92 | struct pt_regs *regs) | ||
93 | { | 92 | { |
94 | printk(KERN_INFO | 93 | printk(KERN_INFO |
95 | "VoyagerGX: spurious interrupt, status: 0x%x\n", | 94 | "VoyagerGX: spurious interrupt, status: 0x%x\n", |