From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 6 Aug 2008 14:05:38 +0200 Subject: Fix merge problems Signed-off-by: Stefan Roese --- cpu/nios2/sysid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpu/nios2/sysid.c') diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c index b5a29593e..697ed03a2 100644 --- a/cpu/nios2/sysid.c +++ b/cpu/nios2/sysid.c @@ -40,7 +40,7 @@ void display_sysid (void) stamp = readl (&sysid->timestamp); localtime_r (&stamp, &t); asctime_r (&t, asc); - printf ("SYSID : %08x, %s", readl (&sysid->id), asc); + printf ("SYSID : %08lx, %s", readl (&sysid->id), asc); } -- cgit v1.2.3-70-g09d2