diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 06:51:33 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 06:51:33 -0500 |
commit | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (patch) | |
tree | 0ad091f645fbc8318634599d278966a53d3922ee /arch/mips/include/asm/mach-lantiq | |
parent | 612663a974065c3445e641d046769fe4c55a6438 (diff) | |
parent | 535237cecab2b078114be712c67e89a0db61965f (diff) |
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/mips/include/asm/mach-lantiq')
-rw-r--r-- | arch/mips/include/asm/mach-lantiq/lantiq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h index 5e8a6e965756..f196cceb7322 100644 --- a/arch/mips/include/asm/mach-lantiq/lantiq.h +++ b/arch/mips/include/asm/mach-lantiq/lantiq.h | |||
@@ -34,6 +34,7 @@ extern spinlock_t ebu_lock; | |||
34 | extern void ltq_disable_irq(struct irq_data *data); | 34 | extern void ltq_disable_irq(struct irq_data *data); |
35 | extern void ltq_mask_and_ack_irq(struct irq_data *data); | 35 | extern void ltq_mask_and_ack_irq(struct irq_data *data); |
36 | extern void ltq_enable_irq(struct irq_data *data); | 36 | extern void ltq_enable_irq(struct irq_data *data); |
37 | extern int ltq_eiu_get_irq(int exin); | ||
37 | 38 | ||
38 | /* clock handling */ | 39 | /* clock handling */ |
39 | extern int clk_activate(struct clk *clk); | 40 | extern int clk_activate(struct clk *clk); |
@@ -41,6 +42,7 @@ extern void clk_deactivate(struct clk *clk); | |||
41 | extern struct clk *clk_get_cpu(void); | 42 | extern struct clk *clk_get_cpu(void); |
42 | extern struct clk *clk_get_fpi(void); | 43 | extern struct clk *clk_get_fpi(void); |
43 | extern struct clk *clk_get_io(void); | 44 | extern struct clk *clk_get_io(void); |
45 | extern struct clk *clk_get_ppe(void); | ||
44 | 46 | ||
45 | /* find out what bootsource we have */ | 47 | /* find out what bootsource we have */ |
46 | extern unsigned char ltq_boot_select(void); | 48 | extern unsigned char ltq_boot_select(void); |