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
/
arm
/
mach-footbridge
/
isa-irq.c
diff --git
a/arch/arm/mach-footbridge/isa-irq.c
b/arch/arm/mach-footbridge/isa-irq.c
index
de7a5cb
..
c3a0abb
100644
(file)
--- a/
arch/arm/mach-footbridge/isa-irq.c
+++ b/
arch/arm/mach-footbridge/isa-irq.c
@@
-151,14
+151,14
@@
void __init isa_init_irq(unsigned int host_irq)
if (host_irq != (unsigned int)-1) {
for (irq = _ISA_IRQ(0); irq < _ISA_IRQ(8); irq++) {
if (host_irq != (unsigned int)-1) {
for (irq = _ISA_IRQ(0); irq < _ISA_IRQ(8); irq++) {
- set_irq_chip(irq, &isa_lo_chip);
-
set_irq_handler(irq,
handle_level_irq);
+ irq_set_chip_and_handler(irq, &isa_lo_chip,
+
handle_level_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
for (irq = _ISA_IRQ(8); irq < _ISA_IRQ(16); irq++) {
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
for (irq = _ISA_IRQ(8); irq < _ISA_IRQ(16); irq++) {
- set_irq_chip(irq, &isa_hi_chip);
-
set_irq_handler(irq,
handle_level_irq);
+ irq_set_chip_and_handler(irq, &isa_hi_chip,
+
handle_level_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
@@
-166,7
+166,7
@@
void __init isa_init_irq(unsigned int host_irq)
request_resource(&ioport_resource, &pic2_resource);
setup_irq(IRQ_ISA_CASCADE, &irq_cascade);
request_resource(&ioport_resource, &pic2_resource);
setup_irq(IRQ_ISA_CASCADE, &irq_cascade);
-
set_irq
_chained_handler(host_irq, isa_irq_handler);
+
irq_set
_chained_handler(host_irq, isa_irq_handler);
/*
* On the NetWinder, don't automatically
/*
* On the NetWinder, don't automatically