Import 2.3.18pre1

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

diff --git a/drivers/scsi/ultrastor.cb/drivers/scsi/ultrastor.c
index 36fff56..1c97ad4 100644 (file)
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -134,10+134,10 @@
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/proc_fs.h>
+#include <linux/spinlock.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
 #include <asm/system.h>
-#include <asm/spinlock.h>
 #include <asm/dma.h>
 
 #define ULTRASTOR_PRIVATE      /* Get the private stuff from ultrastor.h */