summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-07-13 09:48:03 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-07-13 09:48:03 +0000
commitea02c5005fcf76b2b6e8b3c847d6134492640cea (patch)
tree05b7c2cbf2f35dfc5aed288c30e30bd75e317dfe /sys/arch/hp300/dev
parent20499871c866979e94a6ed88a9701f5d9feb419f (diff)
sync to NETBSD_CURRENT_970711.
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/hd.c9
-rw-r--r--sys/arch/hp300/dev/sd.c9
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 586e421a7ae..2bf87145182 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: hd.c,v 1.5 1997/07/06 08:01:52 downsj Exp $ */
-/* $NetBSD: rd.c,v 1.32 1997/06/24 00:44:03 thorpej Exp $ */
+/* $OpenBSD: hd.c,v 1.6 1997/07/13 09:47:59 downsj Exp $ */
+/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved.
@@ -65,11 +65,6 @@
#include <hp300/dev/hdreg.h>
#include <hp300/dev/hdvar.h>
-#include <vm/vm_param.h>
-#include <vm/lock.h>
-#include <vm/vm_prot.h>
-#include <vm/pmap.h>
-
#include "opt_useleds.h"
#ifdef USELEDS
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index e9bd3e8119a..f168510a78c 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: sd.c,v 1.11 1997/07/06 08:01:56 downsj Exp $ */
-/* $NetBSD: sd.c,v 1.33 1997/06/24 00:44:05 thorpej Exp $ */
+/* $OpenBSD: sd.c,v 1.12 1997/07/13 09:48:00 downsj Exp $ */
+/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved.
@@ -60,11 +60,6 @@
#include <hp300/dev/scsivar.h>
#include <hp300/dev/sdvar.h>
-#include <vm/vm_param.h>
-#include <vm/lock.h>
-#include <vm/vm_prot.h>
-#include <vm/pmap.h>
-
#include "opt_useleds.h"
#ifdef USELEDS