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
/
m68k
/
platform
/
coldfire
/
intc-simr.c
diff --git
a/arch/m68k/platform/coldfire/intc-simr.c
b/arch/m68k/platform/coldfire/intc-simr.c
index
e642b24
..
d6a4d9d
100644
(file)
--- a/
arch/m68k/platform/coldfire/intc-simr.c
+++ b/
arch/m68k/platform/coldfire/intc-simr.c
@@
-141,7
+141,7
@@
static int intc_irq_set_type(struct irq_data *d, unsigned int type)
}
if (tb)
}
if (tb)
-
set_irq
_handler(irq, handle_edge_irq);
+
irq_set
_handler(irq, handle_edge_irq);
ebit = irq2ebit(irq) * 2;
pa = __raw_readw(MCFEPORT_EPPAR);
ebit = irq2ebit(irq) * 2;
pa = __raw_readw(MCFEPORT_EPPAR);
@@
-181,11
+181,11
@@
void __init init_IRQ(void)
eirq = MCFINT_VECBASE + 64 + (MCFINTC1_ICR0 ? 64 : 0);
for (irq = MCFINT_VECBASE; (irq < eirq); irq++) {
if ((irq >= EINT1) && (irq <= EINT7))
eirq = MCFINT_VECBASE + 64 + (MCFINTC1_ICR0 ? 64 : 0);
for (irq = MCFINT_VECBASE; (irq < eirq); irq++) {
if ((irq >= EINT1) && (irq <= EINT7))
-
set_irq
_chip(irq, &intc_irq_chip_edge_port);
+
irq_set
_chip(irq, &intc_irq_chip_edge_port);
else
else
-
set_irq
_chip(irq, &intc_irq_chip);
- set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
-
set_irq
_handler(irq, handle_level_irq);
+
irq_set
_chip(irq, &intc_irq_chip);
+
irq_
set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
+
irq_set
_handler(irq, handle_level_irq);
}
}
}
}