Import 2.3.18pre1

[davej-history.git] / drivers / usb / usb_scsi.c

diff --git a/drivers/usb/usb_scsi.cb/drivers/usb/usb_scsi.c
index 690b8ab..067e7cd 100644 (file)
--- a/drivers/usb/usb_scsi.c
+++ b/drivers/usb/usb_scsi.c
@@ -36,8+36,7 @@
 #include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/malloc.h>
-
-#include <asm/spinlock.h>
+#include <linux/spinlock.h>
 #include <linux/smp_lock.h>
 
 #include <linux/blk.h>