projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irqchip/gic-vic-move' into next/virt
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
plat-samsung
/
s5p-irq.c
diff --git
a/arch/arm/plat-samsung/s5p-irq.c
b/arch/arm/plat-samsung/s5p-irq.c
index
dfb47d6
..
103e371
100644
(file)
--- a/
arch/arm/plat-samsung/s5p-irq.c
+++ b/
arch/arm/plat-samsung/s5p-irq.c
@@
-13,8
+13,7
@@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/io.h>
-
-#include <asm/hardware/vic.h>
+#include <linux/irqchip/arm-vic.h>
#include <mach/map.h>
#include <plat/regs-timer.h>