diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
| commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
| tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /cpu/nios2 | |
| parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
| parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/nios2')
| -rw-r--r-- | cpu/nios2/interrupts.c | 1 | ||||
| -rw-r--r-- | cpu/nios2/sysid.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c index aeb5b65b33..ec5db31b0f 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> diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c index b5a29593ea..697ed03a2c 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); } |