summaryrefslogtreecommitdiffstats
path: root/sys/cam/scsi
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
committerphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
commitee871b6440719fbe58a0cb8e994ad543265f4e1a (patch)
tree5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/cam/scsi
parentf0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff)
downloadFreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip
FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/cam/scsi')
-rw-r--r--sys/cam/scsi/scsi_da.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 630b946..71c15f7 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scsi_da.c,v 1.29 1999/07/06 01:40:03 mjacob Exp $
+ * $Id: scsi_da.c,v 1.30 1999/07/07 18:14:01 mjacob Exp $
*/
#include "opt_hw_wdog.h"
@@ -40,8 +40,8 @@
#include <sys/diskslice.h>
#include <sys/malloc.h>
#include <sys/conf.h>
+#include <sys/cons.h>
-#include <machine/cons.h>
#include <machine/md_var.h>
#include <vm/vm.h>
OpenPOWER on IntegriCloud