summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-04-01 12:55:27 +0000
committermiod <miod@openbsd.org>2013-04-01 12:55:27 +0000
commit709a144af0f9bdae00c9968b48200a16020fa585 (patch)
tree47e27bc1ce1cfadca5113d8438b80bc3a2d0fb3a
parentUnbreak 1.16 (diff)
downloadwireguard-openbsd-709a144af0f9bdae00c9968b48200a16020fa585.tar.xz
wireguard-openbsd-709a144af0f9bdae00c9968b48200a16020fa585.zip
Let the hp300 boot blocks compile again after all the md include churning.
-rw-r--r--sys/arch/hp300/stand/common/hd.c3
-rw-r--r--sys/arch/hp300/stand/include/samachdep.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/hp300/stand/common/hd.c b/sys/arch/hp300/stand/common/hd.c
index c54b5a5782c..730857f789d 100644
--- a/sys/arch/hp300/stand/common/hd.c
+++ b/sys/arch/hp300/stand/common/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.8 2013/02/02 13:34:29 miod Exp $ */
+/* $OpenBSD: hd.c,v 1.9 2013/04/01 12:55:27 miod Exp $ */
/* $NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $ */
/*
@@ -49,6 +49,7 @@
#include "samachdep.h"
+#define DEV_BSHIFT _DEV_BSHIFT
#include <hp300/dev/hdreg.h>
#include "hpibvar.h"
diff --git a/sys/arch/hp300/stand/include/samachdep.h b/sys/arch/hp300/stand/include/samachdep.h
index 1ce6717e8be..6463bae7706 100644
--- a/sys/arch/hp300/stand/include/samachdep.h
+++ b/sys/arch/hp300/stand/include/samachdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: samachdep.h,v 1.8 2013/01/07 20:02:11 miod Exp $ */
+/* $OpenBSD: samachdep.h,v 1.9 2013/04/01 12:55:27 miod Exp $ */
/* $NetBSD: samachdep.h,v 1.3 1997/05/12 07:54:45 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@
#define NITE 4
/* from cpu.h */
-#undef IIOV
+#define INTIOBASE (0x00400000)
#define IIOV(x) (x)
#define MHZ_8 1