diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-23 21:34:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-23 21:34:41 +0000 |
| commit | 7a7321850cd87db045bd14cd561529b0cdb1dfc2 (patch) | |
| tree | 2a6ed230992cc83384d6246329b7611e2ca5b3aa /sys/scsi/scsiconf.c | |
| parent | 63a1e64e5dc33bb6ebe1da87de44ec4e335a32f2 (diff) | |
Merge the only relevant (for now) parts of simplelock.h into lock.h
since it is time to start transitioning away from the no-op behaviour.
ok oga kettenis
Diffstat (limited to 'sys/scsi/scsiconf.c')
| -rw-r--r-- | sys/scsi/scsiconf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 04e563d2a9c..a9e294c3eb7 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.156 2010/04/17 00:51:13 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.157 2010/04/23 21:34:40 deraadt Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -56,12 +56,11 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/buf.h> +#include <sys/lock.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <machine/atomic.h> - #if NBIO > 0 #include <sys/ioctl.h> #include <sys/scsiio.h> |