Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -4
-2
drivers/clocksource/exynos_mct.c
··· 25 25 #include <linux/of_address.h> 26 26 #include <linux/clocksource.h> 27 27 28 - #include <asm/mach/time.h> 29 - 30 28 #define EXYNOS4_MCTREG(x) (x) 31 29 #define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100) 32 30 #define EXYNOS4_MCT_G_CNT_U EXYNOS4_MCTREG(0x104)
+1 -2
drivers/irqchip/exynos-combiner.c
··· 17 17 #include <linux/irqchip/chained_irq.h> 18 18 #include <linux/of_address.h> 19 19 #include <linux/of_irq.h> 20 - #include <asm/mach/irq.h> 21 20 22 21 #include "irqchip.h" 23 22 ··· 80 81 cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq); 81 82 82 83 if (unlikely(!cascade_irq)) 83 - do_bad_IRQ(irq, desc); 84 + handle_bad_irq(irq, desc); 84 85 else 85 86 generic_handle_irq(cascade_irq); 86 87