]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
omap24xx: fix 'reset_timer_masked' declaration error
authorWolfgang Denk <wd@denx.de>
Mon, 5 Sep 2011 05:55:59 +0000 (05:55 +0000)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Sep 2011 20:03:06 +0000 (22:03 +0200)
commit6636eb97e4930bf753fd1461bedd11807c37fc85
tree97b26cf7920de85dfa6c7ff57af9d0bae89952ec
parent6f0d7ae26564a9beb429bb72b2ccf65e73816835
omap24xx: fix 'reset_timer_masked' declaration error

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@denx.de>
Cc: Graeme Russ <graeme.russ@gmail.com>
Cc: Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
arch/arm/cpu/arm1136/omap24xx/timer.c