summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/macppc/dev/abtn.c6
-rw-r--r--sys/arch/macppc/dev/adb.c8
-rw-r--r--sys/arch/macppc/dev/adb_direct.c10
-rw-r--r--sys/arch/macppc/dev/aed.c10
-rw-r--r--sys/arch/macppc/dev/akbd.c18
-rw-r--r--sys/arch/macppc/dev/ams.c10
-rw-r--r--sys/arch/macppc/dev/awacs.c4
-rw-r--r--sys/arch/macppc/dev/dbdma.c4
-rw-r--r--sys/arch/macppc/dev/if_bm.c6
-rw-r--r--sys/arch/macppc/dev/if_gm.c4
-rw-r--r--sys/arch/macppc/dev/openpic.c4
-rw-r--r--sys/arch/macppc/dev/pm_direct.c8
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c4
13 files changed, 48 insertions, 48 deletions
diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c
index c21a800197e..f570a9d9c5f 100644
--- a/sys/arch/macppc/dev/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: abtn.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: abtn.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: abtn.c,v 1.1 1999/07/12 17:48:26 tsubai Exp $ */
/*-
@@ -31,8 +31,8 @@
#include <sys/device.h>
#include <sys/systm.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/pm_direct.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/pm_direct.h>
#define NVRAM_BRIGHTNESS 0x140e
#define ABTN_HANDLER_ID 31
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 08e36ece7b4..439cda2063a 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: adb.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */
/*-
@@ -42,9 +42,9 @@
#include <machine/autoconf.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/akbdvar.h>
-#include <macppc/mac/viareg.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/akbdvar.h>
+#include <macppc/dev/viareg.h>
#include "aed.h"
diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index 4a16ddf59dc..747279f5acb 100644
--- a/sys/arch/macppc/dev/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb_direct.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: adb_direct.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */
/* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -70,10 +70,10 @@
#include <machine/cpu.h>
#include <machine/adbsys.h>
-#include <macppc/mac/viareg.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/adb_direct.h>
-#include <macppc/mac/pm_direct.h>
+#include <macppc/dev/viareg.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/adb_direct.h>
+#include <macppc/dev/pm_direct.h>
#define printf_intr printf
diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c
index 12e2268de86..d5ac8136064 100644
--- a/sys/arch/macppc/dev/aed.c
+++ b/sys/arch/macppc/dev/aed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aed.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: aed.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: aed.c,v 1.5 2000/03/23 06:40:33 thorpej Exp $ */
/*
@@ -43,10 +43,10 @@
#include <machine/autoconf.h>
#include <machine/cpu.h>
-#include <macppc/mac/keyboard.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/aedvar.h>
-#include <macppc/mac/akbdvar.h>
+#include <macppc/dev/keyboard.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/aedvar.h>
+#include <macppc/dev/akbdvar.h>
#define spladb splhigh
diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c
index 5974b616e14..2bc7f43ab1c 100644
--- a/sys/arch/macppc/dev/akbd.c
+++ b/sys/arch/macppc/dev/akbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: akbd.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: akbd.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $ */
/*
@@ -48,14 +48,14 @@
#include <machine/autoconf.h>
#define KEYBOARD_ARRAY
-#include <macppc/mac/keyboard.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/aedvar.h>
-#include <macppc/mac/akbdmap.h>
-#include <macppc/mac/akbdvar.h>
-#include <macppc/mac/amsvar.h>
-#include <macppc/mac/adb_direct.h>
-#include <macppc/mac/pm_direct.h>
+#include <macppc/dev/keyboard.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/aedvar.h>
+#include <macppc/dev/akbdmap.h>
+#include <macppc/dev/akbdvar.h>
+#include <macppc/dev/amsvar.h>
+#include <macppc/dev/adb_direct.h>
+#include <macppc/dev/pm_direct.h>
#include "aed.h"
diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c
index 08dd82193aa..be431ed5ed0 100644
--- a/sys/arch/macppc/dev/ams.c
+++ b/sys/arch/macppc/dev/ams.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ams.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: ams.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */
/* $NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $ */
/*
@@ -45,10 +45,10 @@
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/aedvar.h>
-#include <macppc/mac/amsvar.h>
-#include <macppc/mac/adb_direct.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/aedvar.h>
+#include <macppc/dev/amsvar.h>
+#include <macppc/dev/adb_direct.h>
#include "aed.h"
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index cbceac81def..09bdf3641a7 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: awacs.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: awacs.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $ */
/*-
@@ -44,7 +44,7 @@
#include <machine/autoconf.h>
#include <machine/pio.h>
-#include <macppc/mac/dbdma.h>
+#include <macppc/dev/dbdma.h>
#ifdef AWACS_DEBUG
# define DPRINTF printf
diff --git a/sys/arch/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c
index 508271c12f1..388e834082e 100644
--- a/sys/arch/macppc/dev/dbdma.c
+++ b/sys/arch/macppc/dev/dbdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbdma.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: dbdma.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
@@ -30,7 +30,7 @@
#include <vm/vm.h>
#include <machine/pio.h>
-#include <macppc/mac/dbdma.h>
+#include <macppc/dev/dbdma.h>
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 61eb8e857b0..2e89ebb790e 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bm.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: if_bm.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */
/*-
@@ -57,8 +57,8 @@
#include <machine/autoconf.h>
#include <machine/pio.h>
-#include <macppc/mac/dbdma.h>
-#include <macppc/mac/if_bmreg.h>
+#include <macppc/dev/dbdma.h>
+#include <macppc/dev/if_bmreg.h>
#define BMAC_TXBUFS 2
#define BMAC_RXBUFS 16
diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c
index 11093c25096..04d546bc9f3 100644
--- a/sys/arch/macppc/dev/if_gm.c
+++ b/sys/arch/macppc/dev/if_gm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gm.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: if_gm.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: if_gm.c,v 1.2 2000/03/04 11:17:00 tsubai Exp $ */
/*-
@@ -67,7 +67,7 @@
#include <dev/pci/pcidevs.h>
#include <dev/ofw/openfirm.h>
-#include <macppc/mac/if_gmreg.h>
+#include <macppc/dev/if_gmreg.h>
#include <machine/pio.h>
#define NTXBUF 4
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 85bf783cf5c..701afd28e13 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpic.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: openpic.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -55,7 +55,7 @@
#include <machine/psl.h>
#include <machine/pio.h>
#include <machine/powerpc.h>
-#include <macppc/mac/openpicreg.h>
+#include <macppc/dev/openpicreg.h>
#include <dev/ofw/openfirm.h>
#define ICU_LEN 128
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 4ec07563fed..2dc914231ad 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pm_direct.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: pm_direct.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $ */
/*
@@ -48,9 +48,9 @@
#include <machine/adbsys.h>
#include <machine/cpu.h>
-#include <macppc/mac/adbvar.h>
-#include <macppc/mac/pm_direct.h>
-#include <macppc/mac/viareg.h>
+#include <macppc/dev/adbvar.h>
+#include <macppc/dev/pm_direct.h>
+#include <macppc/dev/viareg.h>
extern int adb_polling; /* Are we polling? (Debugger mode) */
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index f58cdec4372..58abac913d9 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_obio.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
+/* $OpenBSD: wdc_obio.c,v 1.2 2001/09/01 17:43:09 drahn Exp $ */
/* $NetBSD: wdc_obio.c,v 1.4 1999/06/14 08:53:06 tsubai Exp $ */
/*-
@@ -52,7 +52,7 @@
#include <dev/ata/atareg.h>
#include <dev/ic/wdcvar.h>
-#include <macppc/mac/dbdma.h>
+#include <macppc/dev/dbdma.h>
#define WDC_REG_NPORTS 8
#define WDC_AUXREG_OFFSET 0x16