diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 12:05:29 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 12:05:29 -0500 |
commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-omap2/board-generic.c | |
parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 53cb380b7877..73be86852f6a 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
17 | #include <linux/irqdomain.h> | 17 | #include <linux/irqdomain.h> |
18 | 18 | ||
19 | #include <asm/hardware/gic.h> | ||
20 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
21 | 20 | ||
22 | #include "common.h" | 21 | #include "common.h" |
@@ -156,7 +155,6 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") | |||
156 | .map_io = omap4_map_io, | 155 | .map_io = omap4_map_io, |
157 | .init_early = omap4430_init_early, | 156 | .init_early = omap4430_init_early, |
158 | .init_irq = omap_gic_of_init, | 157 | .init_irq = omap_gic_of_init, |
159 | .handle_irq = gic_handle_irq, | ||
160 | .init_machine = omap_generic_init, | 158 | .init_machine = omap_generic_init, |
161 | .init_late = omap4430_init_late, | 159 | .init_late = omap4430_init_late, |
162 | .timer = &omap4_timer, | 160 | .timer = &omap4_timer, |
@@ -177,7 +175,6 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)") | |||
177 | .map_io = omap5_map_io, | 175 | .map_io = omap5_map_io, |
178 | .init_early = omap5_init_early, | 176 | .init_early = omap5_init_early, |
179 | .init_irq = omap_gic_of_init, | 177 | .init_irq = omap_gic_of_init, |
180 | .handle_irq = gic_handle_irq, | ||
181 | .init_machine = omap_generic_init, | 178 | .init_machine = omap_generic_init, |
182 | .timer = &omap5_timer, | 179 | .timer = &omap5_timer, |
183 | .dt_compat = omap5_boards_compat, | 180 | .dt_compat = omap5_boards_compat, |