Import 2.3.18pre1

[davej-history.git] / drivers / scsi / scsi.c

diff --git a/drivers/scsi/scsi.cb/drivers/scsi/scsi.c
index d45c1a6..7c44cdf 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -54,11+54,11 @@
 #define __KERNEL_SYSCALLS__
 
 #include <linux/unistd.h>
+#include <linux/spinlock.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/spinlock.h>
 
 #include "scsi.h"
 #include "hosts.h"