diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /cpu/microblaze/interrupts.c | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu/microblaze/interrupts.c')
| -rw-r--r-- | cpu/microblaze/interrupts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/microblaze/interrupts.c b/cpu/microblaze/interrupts.c index 3f04b29983..26e88cb519 100644 --- a/cpu/microblaze/interrupts.c +++ b/cpu/microblaze/interrupts.c @@ -203,7 +203,7 @@ int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) for (i = 0; i < CFG_INTC_0_NUM; i++) { if (act->handler != (interrupt_handler_t*) def_hdlr) { - printf ("%02d %08lx %08lx %d\n", i, + printf ("%02d %08x %08x %d\n", i, (int)act->handler, (int)act->arg, act->count); } act++; |