Module Name: src
Committed By: phx
Date: Mon Oct 18 22:02:25 UTC 2010
Modified Files:
src/sys/arch/amiga/dev: bzivsc.c bzsc.c bztzsc.c cbiisc.c cbsc.c flsc.c
if_bah_zbus.c sbic.c
Log Message:
opt_m68k_arch.h can only be included when compiling for amiga/68k.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/bzivsc.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/bzsc.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/dev/bztzsc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/cbiisc.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/cbsc.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amiga/dev/flsc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/dev/if_bah_zbus.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/sbic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/bzivsc.c
diff -u src/sys/arch/amiga/dev/bzivsc.c:1.29 src/sys/arch/amiga/dev/bzivsc.c:1.30
--- src/sys/arch/amiga/dev/bzivsc.c:1.29 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/bzivsc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bzivsc.c,v 1.29 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: bzivsc.c,v 1.30 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,10 +31,12 @@
*
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.29 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.30 2010/10/18 22:02:25 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/bzsc.c
diff -u src/sys/arch/amiga/dev/bzsc.c:1.46 src/sys/arch/amiga/dev/bzsc.c:1.47
--- src/sys/arch/amiga/dev/bzsc.c:1.46 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/bzsc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bzsc.c,v 1.46 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: bzsc.c,v 1.47 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -36,10 +36,12 @@
* SUCH DAMAGE.
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzsc.c,v 1.46 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzsc.c,v 1.47 2010/10/18 22:02:25 phx Exp $");
/*
* Initial amiga Blizzard 1230-II driver by Daniel Widenfalk. Conversion to
Index: src/sys/arch/amiga/dev/bztzsc.c
diff -u src/sys/arch/amiga/dev/bztzsc.c:1.34 src/sys/arch/amiga/dev/bztzsc.c:1.35
--- src/sys/arch/amiga/dev/bztzsc.c:1.34 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/bztzsc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bztzsc.c,v 1.34 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: bztzsc.c,v 1.35 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -37,10 +37,12 @@
* 53c9x MI driver by Michael L. Hitch (mhi...@montana.edu).
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.34 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.35 2010/10/18 22:02:25 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/cbiisc.c
diff -u src/sys/arch/amiga/dev/cbiisc.c:1.30 src/sys/arch/amiga/dev/cbiisc.c:1.31
--- src/sys/arch/amiga/dev/cbiisc.c:1.30 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/cbiisc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cbiisc.c,v 1.30 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: cbiisc.c,v 1.31 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,10 +31,12 @@
*
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.30 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.31 2010/10/18 22:02:25 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/cbsc.c
diff -u src/sys/arch/amiga/dev/cbsc.c:1.31 src/sys/arch/amiga/dev/cbsc.c:1.32
--- src/sys/arch/amiga/dev/cbsc.c:1.31 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/cbsc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cbsc.c,v 1.31 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: cbsc.c,v 1.32 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,10 +31,12 @@
*
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.31 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.32 2010/10/18 22:02:25 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/flsc.c
diff -u src/sys/arch/amiga/dev/flsc.c:1.43 src/sys/arch/amiga/dev/flsc.c:1.44
--- src/sys/arch/amiga/dev/flsc.c:1.43 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/flsc.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: flsc.c,v 1.43 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: flsc.c,v 1.44 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -42,10 +42,12 @@
*/
#include "opt_ddb.h"
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flsc.c,v 1.43 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flsc.c,v 1.44 2010/10/18 22:02:25 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/if_bah_zbus.c
diff -u src/sys/arch/amiga/dev/if_bah_zbus.c:1.12 src/sys/arch/amiga/dev/if_bah_zbus.c:1.13
--- src/sys/arch/amiga/dev/if_bah_zbus.c:1.12 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/if_bah_zbus.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bah_zbus.c,v 1.12 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -29,10 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.12 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $");
/*
* Driver frontend for the Commodore Busines Machines and the
Index: src/sys/arch/amiga/dev/sbic.c
diff -u src/sys/arch/amiga/dev/sbic.c:1.67 src/sys/arch/amiga/dev/sbic.c:1.68
--- src/sys/arch/amiga/dev/sbic.c:1.67 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/amiga/dev/sbic.c Mon Oct 18 22:02:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.67 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: sbic.c,v 1.68 2010/10/18 22:02:25 phx Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -76,10 +76,12 @@
*/
#include "opt_ddb.h"
+#ifdef __m68k__
#include "opt_m68k_arch.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.67 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.68 2010/10/18 22:02:25 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
