diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 08:39:47 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 08:39:47 +0200 |
| commit | 7ea5db8efeac8627500e012aa6829ca612c5a700 (patch) | |
| tree | 90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/alpha/kernel/irq_i8259.c | |
| parent | sh: landisk: Remove whitespace (diff) | |
| parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-7ea5db8efeac8627500e012aa6829ca612c5a700.tar.xz linux-7ea5db8efeac8627500e012aa6829ca612c5a700.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/alpha/kernel/irq_i8259.c')
| -rw-r--r-- | arch/alpha/kernel/irq_i8259.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c index c7cc9813e45f..e1861c77dabc 100644 --- a/arch/alpha/kernel/irq_i8259.c +++ b/arch/alpha/kernel/irq_i8259.c @@ -92,7 +92,7 @@ init_i8259a_irqs(void) outb(0xff, 0xA1); /* mask all of 8259A-2 */ for (i = 0; i < 16; i++) { - set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq); + irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq); } setup_irq(2, &cascade); |