In an earlier proposed patch, bcmstb.c implemented timer_read_counter, but it was updated to implement get_ticks instead. This patch updates the declaration in timer.h accordingly.

Signed-off-by: Thomas Fitzsimmons fitzsim@fitzsim.org --- arch/arm/mach-bcmstb/include/mach/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h index d05b4d6..039dd66 100644 --- a/arch/arm/mach-bcmstb/include/mach/timer.h +++ b/arch/arm/mach-bcmstb/include/mach/timer.h @@ -8,6 +8,6 @@ #ifndef _BCMSTB_TIMER_H #define _BCMSTB_TIMER_H

-unsigned long timer_read_counter(void); +uint64_t get_ticks(void);

#endif /* _BCMSTB_TIMER_H */