Import 2.3.18pre1

[davej-history.git] / arch / mips / sni / io.c

diff --git a/arch/mips/sni/io.cb/arch/mips/sni/io.c
index 1e14ebf..1b57e9b 100644 (file)
--- a/arch/mips/sni/io.c
+++ b/arch/mips/sni/io.c
@@ -7,10+7,10 @@
  * Low level I/O functions for SNI.
  */
 #include <linux/string.h>
+#include <linux/spinlock.h>
 #include <asm/mipsconfig.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
-#include <asm/spinlock.h>
 #include <asm/sni.h>
 
 /*