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 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mach-bcmring
/
irq.c
diff --git
a/arch/arm/mach-bcmring/irq.c
b/arch/arm/mach-bcmring/irq.c
index
84dcda0
..
c48feaf
100644
(file)
--- a/
arch/arm/mach-bcmring/irq.c
+++ b/
arch/arm/mach-bcmring/irq.c
@@
-93,11
+93,11
@@
static void vic_init(void __iomem *base, struct irq_chip *chip,
unsigned int i;
for (i = 0; i < 32; i++) {
unsigned int irq = irq_start + i;
unsigned int i;
for (i = 0; i < 32; i++) {
unsigned int irq = irq_start + i;
-
set_irq
_chip(irq, chip);
-
set_irq
_chip_data(irq, base);
+
irq_set
_chip(irq, chip);
+
irq_set
_chip_data(irq, base);
if (vic_sources & (1 << i)) {
if (vic_sources & (1 << i)) {
-
set_irq
_handler(irq, handle_level_irq);
+
irq_set
_handler(irq, handle_level_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
@@
-119,9
+119,9
@@
void __init bcmring_init_irq(void)
/* special cases */
if (INTCHW_INTC1_GPIO0 & IRQ_INTC1_VALID_MASK) {
/* special cases */
if (INTCHW_INTC1_GPIO0 & IRQ_INTC1_VALID_MASK) {
-
set_irq
_handler(IRQ_GPIO0, handle_simple_irq);
+
irq_set
_handler(IRQ_GPIO0, handle_simple_irq);
}
if (INTCHW_INTC1_GPIO1 & IRQ_INTC1_VALID_MASK) {
}
if (INTCHW_INTC1_GPIO1 & IRQ_INTC1_VALID_MASK) {
-
set_irq
_handler(IRQ_GPIO1, handle_simple_irq);
+
irq_set
_handler(IRQ_GPIO1, handle_simple_irq);
}
}
}
}