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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
common
/
vic.c
diff --git
a/arch/arm/common/vic.c
b/arch/arm/common/vic.c
index
ae5fe72
..
113085a
100644
(file)
--- a/
arch/arm/common/vic.c
+++ b/
arch/arm/common/vic.c
@@
-305,9
+305,9
@@
static void __init vic_set_irq_sources(void __iomem *base,
if (vic_sources & (1 << i)) {
unsigned int irq = irq_start + i;
if (vic_sources & (1 << i)) {
unsigned int irq = irq_start + i;
- set_irq_chip(irq, &vic_chip);
-
set_irq_chip_data(irq, base
);
-
set_irq_handler(irq, handle_level_irq
);
+ irq_set_chip_and_handler(irq, &vic_chip,
+
handle_level_irq
);
+
irq_set_chip_data(irq, base
);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}