summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-bcm2836.c
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2016-06-23 22:08:40 +0300
committerJason Cooper <jason@lakedaemon.net>2016-06-23 22:08:40 +0300
commite04558cbfe61cd06d762eaaa587616798d9b65b6 (patch)
treeb29d56f9b95b62dff6bcfb8ae31928d1266fc529 /drivers/irqchip/irq-bcm2836.c
parentd7e3528eed85b51ddca2f281d2d4e7d687f28d60 (diff)
parent353332855eef20dc5ae8cd42aaafb4750748f90b (diff)
downloadlinux-e04558cbfe61cd06d762eaaa587616798d9b65b6.tar.xz
Merge branch 'irqchip/misc' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-bcm2836.c')
-rw-r--r--drivers/irqchip/irq-bcm2836.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index 27875982657e..df1949c0aa23 100644
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -224,8 +224,8 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = {
};
#ifdef CONFIG_ARM
-int __init bcm2836_smp_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
+static int __init bcm2836_smp_boot_secondary(unsigned int cpu,
+ struct task_struct *idle)
{
unsigned long secondary_startup_phys =
(unsigned long)virt_to_phys((void *)secondary_startup);