aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-09 14:26:31 -0400
committerOlof Johansson <olof@lixom.net>2014-03-09 14:26:31 -0400
commit687fb3c8a0d36c50434fe1b66c5f4fe9161e5983 (patch)
tree56e62ba4c4e22390a03a1faba086c87c2d3ff0f4 /drivers/irqchip
parentcf460cde7c72283708cd494cf7feb4203f72c748 (diff)
parenta83784859ccde07ebdc3a7acfbb2f74cb6c75a80 (diff)
Merge tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Samsung drivers update for v3.15 from Kukjin Kim: - remove inclusion <asm/mach/time.h> from exynos_mct.c - remove inclusion <asm/mach/irq.h> from exynos-combiner.c and use calling handle_bad_irq() instead of do_bad_IRQ() * tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: irqchip: exynos-combiner: call handle_bad_irq directly clocksource: exynos_mct: remove unwanted header file inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/exynos-combiner.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
index 40e6440348ff..f8636a650cf6 100644
--- a/drivers/irqchip/exynos-combiner.c
+++ b/drivers/irqchip/exynos-combiner.c
@@ -17,7 +17,6 @@
17#include <linux/irqchip/chained_irq.h> 17#include <linux/irqchip/chained_irq.h>
18#include <linux/of_address.h> 18#include <linux/of_address.h>
19#include <linux/of_irq.h> 19#include <linux/of_irq.h>
20#include <asm/mach/irq.h>
21 20
22#include "irqchip.h" 21#include "irqchip.h"
23 22
@@ -81,7 +80,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
81 cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq); 80 cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq);
82 81
83 if (unlikely(!cascade_irq)) 82 if (unlikely(!cascade_irq))
84 do_bad_IRQ(irq, desc); 83 handle_bad_irq(irq, desc);
85 else 84 else
86 generic_handle_irq(cascade_irq); 85 generic_handle_irq(cascade_irq);
87 86