summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clocksource.c
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-10-22 18:44:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-22 20:47:02 +0200
commit724d3d867268dc2fc52448beadf4bf5c85cfbd28 (patch)
tree2d2e757bc6120825c31a23c083a12dbd7310cea7 /arch/arm/mach-imx/clocksource.c
parentc3626f2a0d657ced28df1cb83173e8b209b64959 (diff)
downloadbarebox-724d3d867268dc2fc52448beadf4bf5c85cfbd28.tar.gz
barebox-724d3d867268dc2fc52448beadf4bf5c85cfbd28.tar.xz
reset_cpu: unify declaration
include/common.h declares this as "unsigned long addr", so we unify it. This also silences a doxygen warning. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/clocksource.c')
-rw-r--r--arch/arm/mach-imx/clocksource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index b8101e948f..5b1bad52f8 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -118,7 +118,7 @@ core_initcall(clocksource_init);
/*
* Reset the cpu by setting up the watchdog timer and let it time out
*/
-void __noreturn reset_cpu (unsigned long ignored)
+void __noreturn reset_cpu (unsigned long addr)
{
/* Disable watchdog and set Time-Out field to 0 */
writew(0x0, IMX_WDT_BASE + WDOG_WCR);