diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/jazz/irq.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/jazz/irq.c')
| -rw-r--r-- | arch/mips/jazz/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 478be9858a1e..eef05093deb4 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
| @@ -55,7 +55,7 @@ static void end_r4030_irq(unsigned int irq) | |||
| 55 | enable_r4030_irq(irq); | 55 | enable_r4030_irq(irq); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static struct hw_interrupt_type r4030_irq_type = { | 58 | static struct irq_chip r4030_irq_type = { |
| 59 | .typename = "R4030", | 59 | .typename = "R4030", |
| 60 | .startup = startup_r4030_irq, | 60 | .startup = startup_r4030_irq, |
| 61 | .shutdown = shutdown_r4030_irq, | 61 | .shutdown = shutdown_r4030_irq, |