commit f2302d4430e7f3f48308d6a585320fe96af8afbd
author Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
committer Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
tree eec529fa883a32b0bd44f65aa46a454dc5c69688
parent 9246f5ecfd353ae297a02ffd5328402acf16c9dd

Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>

cpu/nios2/interrupts.c

diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c
index aeb5b65..ec5db31b 100644
--- a/cpu/nios2/interrupts.c
+++ b/cpu/nios2/interrupts.c
@@ -27,6 +27,7 @@
 
 #include <nios2.h>
 #include <nios2-io.h>
+#include <asm/types.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <common.h>

cpu/nios2/sysid.c

diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c
index b5a2959..697ed03 100644
--- a/cpu/nios2/sysid.c
+++ b/cpu/nios2/sysid.c
@@ -40,7 +40,7 @@
 	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);
 
 }