diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
| commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
| tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /drivers/irqchip/irq-gic-realview.c | |
| parent | ASoC: remove duplicate definition of dapm_routes/num_dapm_routes (diff) | |
| parent | Linux 4.13-rc7 (diff) | |
| download | linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.xz linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip | |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
Diffstat (limited to 'drivers/irqchip/irq-gic-realview.c')
| -rw-r--r-- | drivers/irqchip/irq-gic-realview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-realview.c b/drivers/irqchip/irq-gic-realview.c index 54c296401525..18d58d2b4ffe 100644 --- a/drivers/irqchip/irq-gic-realview.c +++ b/drivers/irqchip/irq-gic-realview.c @@ -43,7 +43,7 @@ static const struct of_device_id syscon_pldset_of_match[] = { static int __init realview_gic_of_init(struct device_node *node, struct device_node *parent) { - static struct regmap *map; + struct regmap *map; struct device_node *np; const struct of_device_id *gic_id; u32 pld1_ctrl; |