summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-10-19 11:59:34 +0000
committerad <ad@NetBSD.org>2007-10-19 11:59:34 +0000
commita2a3828545f06ae25986dcfcd3831f7308c09784 (patch)
tree1ae2eaf3967585225c706634df5ff7207bbfa6b8 /sys/dev/mca
parent1ba4d2957ab5b24977347329a3bb4ad8491f12e4 (diff)
machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/aha_mca.c8
-rw-r--r--sys/dev/mca/com_mca.c8
-rw-r--r--sys/dev/mca/ed_mca.c8
-rw-r--r--sys/dev/mca/edc_mca.c8
-rw-r--r--sys/dev/mca/esp_mca.c8
-rw-r--r--sys/dev/mca/if_ate_mca.c8
-rw-r--r--sys/dev/mca/if_elmc_mca.c6
-rw-r--r--sys/dev/mca/if_ep_mca.c6
-rw-r--r--sys/dev/mca/if_le_mca.c10
-rw-r--r--sys/dev/mca/if_ne_mca.c6
-rw-r--r--sys/dev/mca/if_tra_mca.c8
-rw-r--r--sys/dev/mca/if_we_mca.c6
-rw-r--r--sys/dev/mca/mca.c6
-rw-r--r--sys/dev/mca/mcavar.h4
14 files changed, 50 insertions, 50 deletions
diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c
index 72a68120e23..e4eb8074d6b 100644
--- a/sys/dev/mca/aha_mca.c
+++ b/sys/dev/mca/aha_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: aha_mca.c,v 1.17 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,14 +52,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.17 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index f5155906f19..b9aa7b0cdfc 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: com_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,8 +87,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $"
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 8b05fa35016..13746d70902 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $ */
+/* $NetBSD: ed_mca.c,v 1.39 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.39 2007/10/19 12:00:34 ad Exp $");
#include "rnd.h"
@@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 122b1ab8aa3..fcf6496af64 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $ */
+/* $NetBSD: edc_mca.c,v 1.38 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.38 2007/10/19 12:00:34 ad Exp $");
#include "rnd.h"
@@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mca/mcareg.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c
index a3c0f788b96..35a1802c62d 100644
--- a/sys/dev/mca/esp_mca.c
+++ b/sys/dev/mca/esp_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $ */
+/* $NetBSD: esp_mca.c,v 1.16 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.16 2007/10/19 12:00:34 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $"
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/ic/ncr53c9xreg.h>
#include <dev/ic/ncr53c9xvar.h>
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index e75c7c8bcab..c8ee9bcb746 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c
index bfeddb0d59d..f33eec1bc32 100644
--- a/sys/dev/mca/if_elmc_mca.c
+++ b/sys/dev/mca/if_elmc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.23 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.23 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Ex
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i82586reg.h>
#include <dev/ic/i82586var.h>
diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c
index 2ebe65bf4e1..0082c9d8c1c 100644
--- a/sys/dev/mca/if_ep_mca.c
+++ b/sys/dev/mca/if_ep_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ep_mca.c,v 1.18 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.18 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index 62029501e4c..480cad9e82b 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_le_mca.c,v 1.16 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.16 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,9 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c
index c89d6ea3bd9..418e5dc885f 100644
--- a/sys/dev/mca/if_ne_mca.c
+++ b/sys/dev/mca/if_ne_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ne_mca.c,v 1.13 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.13 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 0efc82d2449..6a1627c8d57 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.8 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.8 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86950reg.h>
#include <dev/ic/mb86950var.h>
diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c
index 287eaeec589..b3f012b6c02 100644
--- a/sys/dev/mca/if_we_mca.c
+++ b/sys/dev/mca/if_we_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_we_mca.c,v 1.19 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.19 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mca/mcareg.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index 7160f041e16..464846caf4d 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $ */
+/* $NetBSD: mca.c,v 1.24 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,13 +42,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.24 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mca_machdep.h>
#include <dev/mca/mcareg.h>
diff --git a/sys/dev/mca/mcavar.h b/sys/dev/mca/mcavar.h
index 3362b2eae91..ccec7f00906 100644
--- a/sys/dev/mca/mcavar.h
+++ b/sys/dev/mca/mcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcavar.h,v 1.9 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: mcavar.h,v 1.10 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
* separated into mca_machdep.h.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mca_machdep.h>
struct mcabus_attach_args {