projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
irqchip
/
exynos-combiner.c
diff --git
a/drivers/irqchip/exynos-combiner.c
b/drivers/irqchip/exynos-combiner.c
index 40e6440348ff5d9ace76ff17510bbf40ae648415..f8636a650cf6489a16d21b09df4e6c49127c5299 100644
(file)
--- a/
drivers/irqchip/exynos-combiner.c
+++ b/
drivers/irqchip/exynos-combiner.c
@@
-17,7
+17,6
@@
#include <linux/irqchip/chained_irq.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-#include <asm/mach/irq.h>
#include "irqchip.h"
#include "irqchip.h"
@@
-81,7
+80,7
@@
static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq);
if (unlikely(!cascade_irq))
cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq);
if (unlikely(!cascade_irq))
-
do_bad_IRQ
(irq, desc);
+
handle_bad_irq
(irq, desc);
else
generic_handle_irq(cascade_irq);
else
generic_handle_irq(cascade_irq);