summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2016-02-21 14:46:27 +0000
committerJason Cooper <jason@lakedaemon.net>2016-02-21 14:46:27 +0000
commit7cf03c9fe5d1d22e26afed58f6eedcd861511936 (patch)
tree97d9741c04a11d90299b0f0b93e6161ed2ae43d0 /arch/mips/include/asm
parent55e10798f6f74c93f36dc4a3d2ff65f1d694fbd5 (diff)
parent81ffb18ce4a0c400b051c3df67e452410d6be1ec (diff)
downloadlinux-stable-7cf03c9fe5d1d22e26afed58f6eedcd861511936.tar.gz
linux-stable-7cf03c9fe5d1d22e26afed58f6eedcd861511936.tar.bz2
linux-stable-7cf03c9fe5d1d22e26afed58f6eedcd861511936.zip
Merge branch 'irqchip/mips' into irqchip/core
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r--arch/mips/include/asm/mach-ath79/ath79.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h
index 2b3487213d1e..441faa92c3cd 100644
--- a/arch/mips/include/asm/mach-ath79/ath79.h
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
@@ -144,4 +144,8 @@ static inline u32 ath79_reset_rr(unsigned reg)
void ath79_device_reset_set(u32 mask);
void ath79_device_reset_clear(u32 mask);
+void ath79_cpu_irq_init(unsigned irq_wb_chan2, unsigned irq_wb_chan3);
+void ath79_misc_irq_init(void __iomem *regs, int irq,
+ int irq_base, bool is_ar71xx);
+
#endif /* __ASM_MACH_ATH79_H */