[ARM] Merge AT91 and devel branches

[mv-sheeva.git] / arch / mips / sni / setup.c

diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 4e98feb15410ea2833fd990e30419ea4b3ee38cc..afeb7f13e5b50a2f290bce79f5209b901fb36bfc 100644 (file)
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -31,7 +31,6 @@
 #include <asm/irq.h>
 #include <asm/mc146818-time.h>
 #include <asm/processor.h>
-#include <asm/ptrace.h>
 #include <asm/reboot.h>
 #include <asm/sni.h>
 #include <asm/time.h>