diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2016-06-23 19:08:40 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2016-06-23 19:08:40 +0000 |
| commit | e04558cbfe61cd06d762eaaa587616798d9b65b6 (patch) | |
| tree | b29d56f9b95b62dff6bcfb8ae31928d1266fc529 /drivers/irqchip/irq-vic.c | |
| parent | d7e3528eed85b51ddca2f281d2d4e7d687f28d60 (diff) | |
| parent | 353332855eef20dc5ae8cd42aaafb4750748f90b (diff) | |
| download | linux-e04558cbfe61cd06d762eaaa587616798d9b65b6.tar.bz2 | |
Merge branch 'irqchip/misc' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-vic.c')
| -rw-r--r-- | drivers/irqchip/irq-vic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index b956dfffe78c..f811a7de5857 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -167,7 +167,7 @@ static int vic_suspend(void) return 0; } -struct syscore_ops vic_syscore_ops = { +static struct syscore_ops vic_syscore_ops = { .suspend = vic_suspend, .resume = vic_resume, }; @@ -517,7 +517,8 @@ int __init vic_init_cascaded(void __iomem *base, unsigned int parent_irq, EXPORT_SYMBOL_GPL(vic_init_cascaded); #ifdef CONFIG_OF -int __init vic_of_init(struct device_node *node, struct device_node *parent) +static int __init vic_of_init(struct device_node *node, + struct device_node *parent) { void __iomem *regs; u32 interrupt_mask = ~0; |