From 072b56c97e17e8e69ddab5a735b5297387a88a70 Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Wed, 30 Oct 1996 22:41:57 +0000 Subject: Merge to NetBSD 961020. Retained our kernel APIs where NetBSD has changed. -Wall -Wstrict-prototypes -Wmissing-prototypes too. --- sys/arch/alpha/include/bus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/arch/alpha/include/bus.h') 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. -- cgit v1.2.3