summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/include/bus.h
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-30 22:41:57 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-30 22:41:57 +0000
commit072b56c97e17e8e69ddab5a735b5297387a88a70 (patch)
tree22eaee09956502609c240ddff8a108d8733521f9 /sys/arch/alpha/include/bus.h
parentb85b15782739220b5bf2563ccdc7ac9e256a31d2 (diff)
Merge to NetBSD 961020. Retained our kernel APIs where NetBSD has changed.
-Wall -Wstrict-prototypes -Wmissing-prototypes too.
Diffstat (limited to 'sys/arch/alpha/include/bus.h')
-rw-r--r--sys/arch/alpha/include/bus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 61cd8cbcbe5..75e7d3fe992 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: bus.h,v 1.2 1996/07/29 22:58:29 niklas Exp $ */
-/* $NetBSD: bus.h,v 1.2.4.2 1996/06/13 17:44:45 cgd Exp $ */
+/* $OpenBSD: bus.h,v 1.3 1996/10/30 22:38:55 niklas Exp $ */
+/* $NetBSD: bus.h,v 1.4 1996/06/11 21:16:21 cgd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.