git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_alcor.c
diff --git
a/arch/alpha/kernel/sys_alcor.c
b/arch/alpha/kernel/sys_alcor.c
index
88d95e8
..
0e14399
100644
(file)
--- a/
arch/alpha/kernel/sys_alcor.c
+++ b/
arch/alpha/kernel/sys_alcor.c
@@
-125,7
+125,7
@@
alcor_init_irq(void)
on while IRQ probing. */
if (i >= 16+20 && i <= 16+30)
continue;
on while IRQ probing. */
if (i >= 16+20 && i <= 16+30)
continue;
-
set_irq
_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
+
irq_set
_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
irq_set_status_flags(i, IRQ_LEVEL);
}
i8259a_irq_type.irq_ack = alcor_isa_mask_and_ack_irq;
irq_set_status_flags(i, IRQ_LEVEL);
}
i8259a_irq_type.irq_ack = alcor_isa_mask_and_ack_irq;