summaryrefslogtreecommitdiff
path: root/sys/dev/isa/isavar.h
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-08 16:43:18 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-08 16:43:18 +0000
commitf002504e4c0ab3d830bf64c740d87aa36bee2fc6 (patch)
tree5114ddfd409cf1da4256c18c3b42ea0b09330aa4 /sys/dev/isa/isavar.h
parent44871426571d01c2486b46d4317ff9caeac6ee4d (diff)
From NetBSD: merge of 960217
Diffstat (limited to 'sys/dev/isa/isavar.h')
-rw-r--r--sys/dev/isa/isavar.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 77649082241..ab8036c8066 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,5 @@
-/* $NetBSD: isavar.h,v 1.16 1995/06/07 06:45:44 cgd Exp $ */
+/* $OpenBSD: isavar.h,v 1.4 1996/03/08 16:43:07 niklas Exp $ */
+/* $NetBSD: isavar.h,v 1.17 1995/12/24 02:31:38 mycroft Exp $ */
/*
* Copyright (c) 1995 Chris G. Demetriou