aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/plat-arcfpga/platform.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-09 12:33:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-09 12:33:18 -0400
commite853ccf08b9ac32ce731600de9618c1a462e8b70 (patch)
tree9abe6729a914aee5621297c49066c58c854c809e /arch/arc/plat-arcfpga/platform.c
parentd7b1fd9140c266c956bf1b4a2c3329aff8da5323 (diff)
parent2a5e95d4181c3f177a41b7c141a816859478c4d7 (diff)
Merge tag 'arc-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta: "Mostly cleanup/refactoring in core intc, cache flush, IPI send..." * tag 'arc-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: mm, arc: remove obsolete pagefault oom killer comment ARC: help gcc elide icache helper for !SMP ARC: move common ops for line/full cache into helpers ARC: cache boot reporting updates ARC: [intc] mask/unmask can be hidden again ARC: [plat-arcfpga] No need for init_irq hack ARC: [intc] don't mask all IRQ by default ARC: prune extra header includes from smp.c ARC: update some comments ARC: [SMP] unify cpu private IRQ requests (TIMER/IPI)
Diffstat (limited to 'arch/arc/plat-arcfpga/platform.c')
-rw-r--r--arch/arc/plat-arcfpga/platform.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-arcfpga/platform.c
index b8d0d456627f..1038949a99a1 100644
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-arcfpga/platform.c
@@ -57,7 +57,6 @@ MACHINE_START(ANGEL4, "angel4")
57 .dt_compat = aa4_compat, 57 .dt_compat = aa4_compat,
58 .init_early = plat_fpga_early_init, 58 .init_early = plat_fpga_early_init,
59 .init_machine = plat_fpga_populate_dev, 59 .init_machine = plat_fpga_populate_dev,
60 .init_irq = plat_fpga_init_IRQ,
61#ifdef CONFIG_ISS_SMP_EXTN 60#ifdef CONFIG_ISS_SMP_EXTN
62 .init_smp = iss_model_init_smp, 61 .init_smp = iss_model_init_smp,
63#endif 62#endif
@@ -72,7 +71,6 @@ MACHINE_START(ML509, "ml509")
72 .dt_compat = ml509_compat, 71 .dt_compat = ml509_compat,
73 .init_early = plat_fpga_early_init, 72 .init_early = plat_fpga_early_init,
74 .init_machine = plat_fpga_populate_dev, 73 .init_machine = plat_fpga_populate_dev,
75 .init_irq = plat_fpga_init_IRQ,
76#ifdef CONFIG_SMP 74#ifdef CONFIG_SMP
77 .init_smp = iss_model_init_smp, 75 .init_smp = iss_model_init_smp,
78#endif 76#endif
@@ -87,5 +85,4 @@ MACHINE_START(NSIMOSCI, "nsimosci")
87 .dt_compat = nsimosci_compat, 85 .dt_compat = nsimosci_compat,
88 .init_early = NULL, 86 .init_early = NULL,
89 .init_machine = plat_fpga_populate_dev, 87 .init_machine = plat_fpga_populate_dev,
90 .init_irq = NULL,
91MACHINE_END 88MACHINE_END