diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-27 12:35:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-27 12:35:35 +0200 |
| commit | df15929f8f5c69e987c31bf016eca4a38dba46f0 (patch) | |
| tree | cfb5fe5e8ebff4cabd70557a304f355546943cc9 /drivers/irqchip/irq-armada-370-xp.c | |
| parent | efaad554b4ffae1840a2759e09e21325ddbc8b05 (diff) | |
| parent | 37e13a1ebe32c4fbfbdb5413f42eb6e71d8b28a4 (diff) | |
Merge branch 'linus' into x86/microcode, to pick up merge window changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/irqchip/irq-armada-370-xp.c')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index e7dc6cbda2a1..7c42b1d13faf 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -541,7 +541,7 @@ static void armada_370_xp_mpic_resume(void) writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); } -struct syscore_ops armada_370_xp_mpic_syscore_ops = { +static struct syscore_ops armada_370_xp_mpic_syscore_ops = { .suspend = armada_370_xp_mpic_suspend, .resume = armada_370_xp_mpic_resume, }; |