| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
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>