aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-07-17 12:02:16 +0100
committerJon Medhurst <tixy@linaro.org>2013-07-17 12:02:16 +0100
commit3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc (patch)
tree3c2b654751fed47261fa77fb2571e0c7897bbfce /include/linux
parent08f87fd1f8d4c4bb7bc2473e63e01841997575a0 (diff)
parentdd94c6f646873c2f16b70e1cc82451fe1c2a83c6 (diff)
downloadvexpress-lsk-3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc.tar.gz
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress
Conflicts: arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/irqchip/arm-gic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 3e203eb23cc..b5696108c06 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -67,6 +67,8 @@ void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
u32 offset, struct device_node *);
void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
+void gic_cpu_if_down(void);
+
static inline void gic_init(unsigned int nr, int start,
void __iomem *dist , void __iomem *cpu)
{