summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_queue.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
commitc7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch)
tree3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/scsi/scsi_queue.c
parent1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff)
o Merge with Linux 2.1.116.
o New Newport console code. o New G364 console code.
Diffstat (limited to 'drivers/scsi/scsi_queue.c')
-rw-r--r--drivers/scsi/scsi_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_queue.c b/drivers/scsi/scsi_queue.c
index 3c29353f9..f76447df7 100644
--- a/drivers/scsi/scsi_queue.c
+++ b/drivers/scsi/scsi_queue.c
@@ -23,7 +23,7 @@
#include <linux/blk.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
-#include <asm/smp_lock.h>
+#include <linux/smp_lock.h>
#define __KERNEL_SYSCALLS__
@@ -58,7 +58,7 @@ static const char RCSid[] = "$Header: /mnt/ide/home/eric/CVSROOT/linux/drivers/s
/*
* Lock used to prevent more than one process from frobbing the list at the
- * same time. FIXME(eric) - there should be seperate spinlocks for each host.
+ * same time. FIXME(eric) - there should be separate spinlocks for each host.
* This will reduce contention.
*/
spinlock_t scsi_mlqueue_lock = SPIN_LOCK_UNLOCKED;