Import 2.3.18pre1

[davej-history.git] / arch / ppc / lib / locks.c

diff --git a/arch/ppc/lib/locks.cb/arch/ppc/lib/locks.c
index 4e1a17c..d6b56dc 100644 (file)
--- a/arch/ppc/lib/locks.c
+++ b/arch/ppc/lib/locks.c
@@ -10,9+10,9 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
+#include <linux/spinlock.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/spinlock.h>
 #include <asm/io.h>
 
 #define DEBUG_LOCKS 1