forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
Fix the issue: tree: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc head: 6ed05a2 commit: af70fdc [4/8] Merge branch 'marco-timer-cleanup-rebase' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/soc config: make ARCH=arm prima2_defconfig All error/warnings: >> arch/arm/mach-prima2/platsmp.c:20:30: fatal error: asm/hardware/gic.h: No such file or directory compilation terminated. -- >> arch/arm/mach-prima2/common.c:15:30: fatal error: asm/hardware/gic.h: No such file or directory compilation terminated. Signed-off-by: Barry Song <[email protected]> Cc: Xie ChanglongX <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
- Loading branch information
Showing
2 changed files
with
3 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,11 +8,10 @@ | |
|
||
#include <linux/init.h> | ||
#include <linux/kernel.h> | ||
#include <linux/of_irq.h> | ||
#include <linux/irqchip.h> | ||
#include <asm/sizes.h> | ||
#include <asm/mach-types.h> | ||
#include <asm/mach/arch.h> | ||
#include <asm/hardware/gic.h> | ||
#include <linux/of.h> | ||
#include <linux/of_platform.h> | ||
#include "common.h" | ||
|
@@ -61,16 +60,6 @@ MACHINE_END | |
#endif | ||
|
||
#ifdef CONFIG_ARCH_MARCO | ||
static const struct of_device_id marco_irq_match[] __initconst = { | ||
{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | ||
{ /* sentinel */ } | ||
}; | ||
|
||
static void __init marco_init_irq(void) | ||
{ | ||
of_irq_init(marco_irq_match); | ||
} | ||
|
||
static const char *marco_dt_match[] __initdata = { | ||
"sirf,marco", | ||
NULL | ||
|
@@ -80,9 +69,8 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") | |
/* Maintainer: Barry Song <[email protected]> */ | ||
.smp = smp_ops(sirfsoc_smp_ops), | ||
.map_io = sirfsoc_map_io, | ||
.init_irq = marco_init_irq, | ||
.init_irq = irqchip_init, | ||
.init_time = sirfsoc_marco_timer_init, | ||
.handle_irq = gic_handle_irq, | ||
.init_machine = sirfsoc_mach_init, | ||
.init_late = sirfsoc_init_late, | ||
.dt_compat = marco_dt_match, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters