diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-31 00:30:38 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-31 00:30:38 +0200 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /arch/mips/lasat/interrupt.c | |
| parent | MTD: Add lock/unlock operations for Atmel AT49BV6416 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| download | linux-0a7d5f8ce960e74fa22986bda4af488539796e49.tar.xz linux-0a7d5f8ce960e74fa22986bda4af488539796e49.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/lasat/interrupt.c')
| -rw-r--r-- | arch/mips/lasat/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 9316a024a818..456be8fc961a 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c @@ -69,7 +69,7 @@ static void end_lasat_irq(unsigned int irq) enable_lasat_irq(irq); } -static struct hw_interrupt_type lasat_irq_type = { +static struct irq_chip lasat_irq_type = { .typename = "Lasat", .startup = startup_lasat_irq, .shutdown = shutdown_lasat_irq, |