From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 14:05:38 +0200
Subject: Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---
 cpu/nios2/interrupts.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cpu/nios2/interrupts.c')

diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c
index aeb5b65b330..ec5db31b0ff 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>
-- 
cgit v1.2.3