diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-05 04:50:27 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-05 04:50:27 +0200 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /arch/mips/vr41xx/nec-cmbvr4133/irq.c | |
| parent | Input: serio/gameport - check whether driver core calls succeeded (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.tar.xz linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/vr41xx/nec-cmbvr4133/irq.c')
| -rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c index 7b2511ca0a61..2483487344c2 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/irq.c @@ -62,7 +62,7 @@ static void end_i8259_irq(unsigned int irq) enable_8259A_irq(irq - I8259_IRQ_BASE); } -static struct hw_interrupt_type i8259_irq_type = { +static struct irq_chip i8259_irq_type = { .typename = "XT-PIC", .startup = startup_i8259_irq, .shutdown = shutdown_i8259_irq, |