[U-Boot] [PATCH] omap24xx: fix 'reset_timer_masked' declaration error

[Wolfgang Denk]

Dear Wolfgang Denk,

In message <1315238159-2565-1-git-send-email-wd at denx.de> you wrote:
> Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a
> static declaration for reset_timer_masked() which causes build errors:
> 
> timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration
> include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here
> 
> Signed-off-by: Wolfgang Denk <wd at denx.de>
> Cc: Graeme Russ <graeme.russ at gmail.com>
> Cc: Cc: Albert ARIBAUD <albert.u.boot at aribaud.net>
> Cc: Sandeep Paulraj <s-paulraj at ti.com>
> ---
>  arch/arm/cpu/arm1136/omap24xx/timer.c |   20 +++++++++-----------
>  1 files changed, 9 insertions(+), 11 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Few people do business well who do nothing else.
                                       -- Philip Earl of Chesterfield