diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 09:42:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 09:42:30 -0400 |
| commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
| tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/include/asm/smp_twd.h | |
| parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
| parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/include/asm/smp_twd.h')
| -rw-r--r-- | arch/arm/include/asm/smp_twd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h index fed9981fba0..ef9ffba97ad 100644 --- a/arch/arm/include/asm/smp_twd.h +++ b/arch/arm/include/asm/smp_twd.h | |||
| @@ -22,7 +22,7 @@ struct clock_event_device; | |||
| 22 | 22 | ||
| 23 | extern void __iomem *twd_base; | 23 | extern void __iomem *twd_base; |
| 24 | 24 | ||
| 25 | int twd_timer_ack(void); | ||
| 26 | void twd_timer_setup(struct clock_event_device *); | 25 | void twd_timer_setup(struct clock_event_device *); |
| 26 | void twd_timer_stop(struct clock_event_device *); | ||
| 27 | 27 | ||
| 28 | #endif | 28 | #endif |