summaryrefslogtreecommitdiff
path: root/arch/alpha/kernel/sys_mikasa.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-26 17:05:39 +0400
committerTakashi Iwai <tiwai@suse.de>2011-04-26 17:05:39 +0400
commit31d44b57c508971c083ce038d7c5ededd09cea01 (patch)
tree249689625896d65894f56763c22f726e39fde5ec /arch/alpha/kernel/sys_mikasa.c
parent885f42e1f466c36e3663d912a831e940f01a112b (diff)
parent1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff)
downloadlinux-31d44b57c508971c083ce038d7c5ededd09cea01.tar.xz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/alpha/kernel/sys_mikasa.c')
-rw-r--r--arch/alpha/kernel/sys_mikasa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index cf7f43dd3147..0e6e4697a025 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -98,7 +98,8 @@ mikasa_init_irq(void)
mikasa_update_irq_hw(0);
for (i = 16; i < 32; ++i) {
- set_irq_chip_and_handler(i, &mikasa_irq_type, handle_level_irq);
+ irq_set_chip_and_handler(i, &mikasa_irq_type,
+ handle_level_irq);
irq_set_status_flags(i, IRQ_LEVEL);
}