diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
| commit | c5b970dd2f809ce3675902f672a1d676aed43c7a (patch) | |
| tree | 89311b14d29ab1d8ea2966e22941ac5b2214db25 /include/linux/irqchip/arm-gic.h | |
| parent | 3bc528d32c5c98a496c3473353e701a6e23c0cb3 (diff) | |
| parent | 892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.9-vexpress
Conflicts:
arch/arm/mach-vexpress/Kconfig
arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'include/linux/irqchip/arm-gic.h')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 2 |
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) { |