summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/macppc/dev/abtn.c (renamed from sys/arch/powerpc/mac/abtn.c)6
-rw-r--r--sys/arch/macppc/dev/adb.c (renamed from sys/arch/powerpc/mac/adb.c)8
-rw-r--r--sys/arch/macppc/dev/adb_direct.c (renamed from sys/arch/powerpc/mac/adb_direct.c)10
-rw-r--r--sys/arch/macppc/dev/adb_direct.h (renamed from sys/arch/powerpc/mac/adb_direct.h)2
-rw-r--r--sys/arch/macppc/dev/adbvar.h (renamed from sys/arch/powerpc/mac/adbvar.h)2
-rw-r--r--sys/arch/macppc/dev/aed.c (renamed from sys/arch/powerpc/mac/aed.c)10
-rw-r--r--sys/arch/macppc/dev/aedvar.h (renamed from sys/arch/powerpc/mac/aedvar.h)2
-rw-r--r--sys/arch/macppc/dev/akbd.c (renamed from sys/arch/powerpc/mac/akbd.c)18
-rw-r--r--sys/arch/macppc/dev/akbdmap.h (renamed from sys/arch/powerpc/mac/akbdmap.h)2
-rw-r--r--sys/arch/macppc/dev/akbdvar.h (renamed from sys/arch/powerpc/mac/akbdvar.h)2
-rw-r--r--sys/arch/macppc/dev/ams.c (renamed from sys/arch/powerpc/mac/ams.c)10
-rw-r--r--sys/arch/macppc/dev/amsvar.h (renamed from sys/arch/powerpc/mac/amsvar.h)2
-rw-r--r--sys/arch/macppc/dev/awacs.c (renamed from sys/arch/powerpc/mac/awacs.c)4
-rw-r--r--sys/arch/macppc/dev/dbdma.c (renamed from sys/arch/powerpc/mac/dbdma.c)4
-rw-r--r--sys/arch/macppc/dev/dbdma.h (renamed from sys/arch/powerpc/mac/dbdma.h)2
-rw-r--r--sys/arch/macppc/dev/gpio.c (renamed from sys/arch/powerpc/mac/gpio.c)2
-rw-r--r--sys/arch/macppc/dev/if_bm.c (renamed from sys/arch/powerpc/mac/if_bm.c)6
-rw-r--r--sys/arch/macppc/dev/if_bmreg.h (renamed from sys/arch/powerpc/mac/if_bmreg.h)2
-rw-r--r--sys/arch/macppc/dev/if_gm.c (renamed from sys/arch/powerpc/mac/if_gm.c)4
-rw-r--r--sys/arch/macppc/dev/if_gmreg.h (renamed from sys/arch/powerpc/mac/if_gmreg.h)2
-rw-r--r--sys/arch/macppc/dev/if_wi_obio.c (renamed from sys/arch/powerpc/mac/if_wi_obio.c)2
-rw-r--r--sys/arch/macppc/dev/keyboard.h (renamed from sys/arch/powerpc/mac/keyboard.h)2
-rw-r--r--sys/arch/macppc/dev/macintr.c (renamed from sys/arch/powerpc/mac/macintr.c)2
-rw-r--r--sys/arch/macppc/dev/mesh.c (renamed from sys/arch/powerpc/mac/mesh.c)2
-rw-r--r--sys/arch/macppc/dev/meshreg.h (renamed from sys/arch/powerpc/mac/meshreg.h)2
-rw-r--r--sys/arch/macppc/dev/openpic.c (renamed from sys/arch/powerpc/mac/openpic.c)4
-rw-r--r--sys/arch/macppc/dev/openpicreg.h (renamed from sys/arch/powerpc/mac/openpicreg.h)2
-rw-r--r--sys/arch/macppc/dev/pm_direct.c (renamed from sys/arch/powerpc/mac/pm_direct.c)8
-rw-r--r--sys/arch/macppc/dev/pm_direct.h (renamed from sys/arch/powerpc/mac/pm_direct.h)2
-rw-r--r--sys/arch/macppc/dev/uni_n.c (renamed from sys/arch/powerpc/mac/uni_n.c)2
-rw-r--r--sys/arch/macppc/dev/viareg.h (renamed from sys/arch/powerpc/mac/viareg.h)2
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c (renamed from sys/arch/powerpc/mac/wdc_obio.c)4
32 files changed, 67 insertions, 67 deletions
diff --git a/sys/arch/powerpc/mac/abtn.c b/sys/arch/macppc/dev/abtn.c
index ec717dd5e18..c21a800197e 100644
--- a/sys/arch/powerpc/mac/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: abtn.c,v 1.3 2001/07/09 03:30:19 mickey Exp $ */
+/* $OpenBSD: abtn.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/adbvar.h>
-#include <powerpc/mac/pm_direct.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/pm_direct.h>
#define NVRAM_BRIGHTNESS 0x140e
#define ABTN_HANDLER_ID 31
diff --git a/sys/arch/powerpc/mac/adb.c b/sys/arch/macppc/dev/adb.c
index 9af91333c2e..08e36ece7b4 100644
--- a/sys/arch/powerpc/mac/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb.c,v 1.5 2001/07/04 08:38:49 niklas Exp $ */
+/* $OpenBSD: adb.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/adbvar.h>
-#include <powerpc/mac/akbdvar.h>
-#include <powerpc/mac/viareg.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/akbdvar.h>
+#include <macppc/mac/viareg.h>
#include "aed.h"
diff --git a/sys/arch/powerpc/mac/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index 569eb66e8b1..4a16ddf59dc 100644
--- a/sys/arch/powerpc/mac/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb_direct.c,v 1.9 2001/08/19 15:09:20 miod Exp $ */
+/* $OpenBSD: adb_direct.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/viareg.h>
-#include <powerpc/mac/adbvar.h>
-#include <powerpc/mac/adb_direct.h>
-#include <powerpc/mac/pm_direct.h>
+#include <macppc/mac/viareg.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/adb_direct.h>
+#include <macppc/mac/pm_direct.h>
#define printf_intr printf
diff --git a/sys/arch/powerpc/mac/adb_direct.h b/sys/arch/macppc/dev/adb_direct.h
index 4d2030085ef..007d2fc9d61 100644
--- a/sys/arch/powerpc/mac/adb_direct.h
+++ b/sys/arch/macppc/dev/adb_direct.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb_direct.h,v 1.3 2001/07/09 03:30:19 mickey Exp $ */
+/* $OpenBSD: adb_direct.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: adb_direct.h,v 1.1 1998/05/15 10:15:47 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/adbvar.h b/sys/arch/macppc/dev/adbvar.h
index 0f0a850d377..04bd6dc9f70 100644
--- a/sys/arch/powerpc/mac/adbvar.h
+++ b/sys/arch/macppc/dev/adbvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: adbvar.h,v 1.3 2001/07/04 08:38:50 niklas Exp $ */
+/* $OpenBSD: adbvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: adbvar.h,v 1.3 2000/06/08 22:10:46 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/aed.c b/sys/arch/macppc/dev/aed.c
index 42ea4c7c983..12e2268de86 100644
--- a/sys/arch/powerpc/mac/aed.c
+++ b/sys/arch/macppc/dev/aed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aed.c,v 1.3 2001/07/04 08:38:50 niklas Exp $ */
+/* $OpenBSD: aed.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/keyboard.h>
-#include <powerpc/mac/adbvar.h>
-#include <powerpc/mac/aedvar.h>
-#include <powerpc/mac/akbdvar.h>
+#include <macppc/mac/keyboard.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/aedvar.h>
+#include <macppc/mac/akbdvar.h>
#define spladb splhigh
diff --git a/sys/arch/powerpc/mac/aedvar.h b/sys/arch/macppc/dev/aedvar.h
index 0c7205ae2f4..f53770e0de3 100644
--- a/sys/arch/powerpc/mac/aedvar.h
+++ b/sys/arch/macppc/dev/aedvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aedvar.h,v 1.2 2001/07/04 08:38:50 niklas Exp $ */
+/* $OpenBSD: aedvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: aedvar.h,v 1.2 2000/03/23 06:40:33 thorpej Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/akbd.c b/sys/arch/macppc/dev/akbd.c
index 893d574cc44..5974b616e14 100644
--- a/sys/arch/powerpc/mac/akbd.c
+++ b/sys/arch/macppc/dev/akbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: akbd.c,v 1.10 2001/07/25 08:21:08 maja Exp $ */
+/* $OpenBSD: akbd.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/keyboard.h>
-#include <powerpc/mac/adbvar.h>
-#include <powerpc/mac/aedvar.h>
-#include <powerpc/mac/akbdmap.h>
-#include <powerpc/mac/akbdvar.h>
-#include <powerpc/mac/amsvar.h>
-#include <powerpc/mac/adb_direct.h>
-#include <powerpc/mac/pm_direct.h>
+#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 "aed.h"
diff --git a/sys/arch/powerpc/mac/akbdmap.h b/sys/arch/macppc/dev/akbdmap.h
index ff3ff6b357b..1a48af2ae10 100644
--- a/sys/arch/powerpc/mac/akbdmap.h
+++ b/sys/arch/macppc/dev/akbdmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: akbdmap.h,v 1.3 2001/07/04 08:38:50 niklas Exp $ */
+/* $OpenBSD: akbdmap.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: akbdmap.h,v 1.3 2000/09/01 16:00:39 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/akbdvar.h b/sys/arch/macppc/dev/akbdvar.h
index 1d0c80aad6f..ff1a56d5365 100644
--- a/sys/arch/powerpc/mac/akbdvar.h
+++ b/sys/arch/macppc/dev/akbdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: akbdvar.h,v 1.3 2001/07/04 08:38:50 niklas Exp $ */
+/* $OpenBSD: akbdvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: akbdvar.h,v 1.4 1999/02/17 14:56:56 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/ams.c b/sys/arch/macppc/dev/ams.c
index 8fca4d070f9..08dd82193aa 100644
--- a/sys/arch/powerpc/mac/ams.c
+++ b/sys/arch/macppc/dev/ams.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ams.c,v 1.4 2001/07/09 03:30:19 mickey Exp $ */
+/* $OpenBSD: ams.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/adbvar.h>
-#include <powerpc/mac/aedvar.h>
-#include <powerpc/mac/amsvar.h>
-#include <powerpc/mac/adb_direct.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/aedvar.h>
+#include <macppc/mac/amsvar.h>
+#include <macppc/mac/adb_direct.h>
#include "aed.h"
diff --git a/sys/arch/powerpc/mac/amsvar.h b/sys/arch/macppc/dev/amsvar.h
index ac2f6151a2e..059131689d6 100644
--- a/sys/arch/powerpc/mac/amsvar.h
+++ b/sys/arch/macppc/dev/amsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: amsvar.h,v 1.2 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: amsvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: amsvar.h,v 1.4 1999/06/17 06:59:05 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/awacs.c b/sys/arch/macppc/dev/awacs.c
index e4e34ba9d05..cbceac81def 100644
--- a/sys/arch/powerpc/mac/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: awacs.c,v 1.7 2001/07/09 03:30:19 mickey Exp $ */
+/* $OpenBSD: awacs.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/dbdma.h>
+#include <macppc/mac/dbdma.h>
#ifdef AWACS_DEBUG
# define DPRINTF printf
diff --git a/sys/arch/powerpc/mac/dbdma.c b/sys/arch/macppc/dev/dbdma.c
index db6e7788614..508271c12f1 100644
--- a/sys/arch/powerpc/mac/dbdma.c
+++ b/sys/arch/macppc/dev/dbdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbdma.c,v 1.3 2001/06/25 23:29:54 drahn Exp $ */
+/* $OpenBSD: dbdma.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/dbdma.h>
+#include <macppc/mac/dbdma.h>
diff --git a/sys/arch/powerpc/mac/dbdma.h b/sys/arch/macppc/dev/dbdma.h
index fda700cfdbe..eb386cd1a82 100644
--- a/sys/arch/powerpc/mac/dbdma.h
+++ b/sys/arch/macppc/dev/dbdma.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbdma.h,v 1.1 1999/11/08 23:46:00 rahnds Exp $ */
+/* $OpenBSD: dbdma.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: dbdma.h,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/gpio.c b/sys/arch/macppc/dev/gpio.c
index 9d35eff2bd3..db4bb579f59 100644
--- a/sys/arch/powerpc/mac/gpio.c
+++ b/sys/arch/macppc/dev/gpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gpio.c,v 1.4 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: gpio.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: gpio.c,v 1.2 2001/02/27 05:16:33 matt Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index bb2c8846e89..61eb8e857b0 100644
--- a/sys/arch/powerpc/mac/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bm.c,v 1.9 2001/07/10 02:16:11 fgsch Exp $ */
+/* $OpenBSD: if_bm.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/dbdma.h>
-#include <powerpc/mac/if_bmreg.h>
+#include <macppc/mac/dbdma.h>
+#include <macppc/mac/if_bmreg.h>
#define BMAC_TXBUFS 2
#define BMAC_RXBUFS 16
diff --git a/sys/arch/powerpc/mac/if_bmreg.h b/sys/arch/macppc/dev/if_bmreg.h
index 8e3f6045321..8506808e952 100644
--- a/sys/arch/powerpc/mac/if_bmreg.h
+++ b/sys/arch/macppc/dev/if_bmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bmreg.h,v 1.2 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: if_bmreg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: if_bmreg.h,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/if_gm.c b/sys/arch/macppc/dev/if_gm.c
index 708180a7e20..11093c25096 100644
--- a/sys/arch/powerpc/mac/if_gm.c
+++ b/sys/arch/macppc/dev/if_gm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gm.c,v 1.19 2001/08/25 10:13:29 art Exp $ */
+/* $OpenBSD: if_gm.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/if_gmreg.h>
+#include <macppc/mac/if_gmreg.h>
#include <machine/pio.h>
#define NTXBUF 4
diff --git a/sys/arch/powerpc/mac/if_gmreg.h b/sys/arch/macppc/dev/if_gmreg.h
index bc5d3c2484b..f7de0e583d1 100644
--- a/sys/arch/powerpc/mac/if_gmreg.h
+++ b/sys/arch/macppc/dev/if_gmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gmreg.h,v 1.4 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: if_gmreg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: if_gmreg.h,v 1.1 2000/02/27 18:00:55 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 96b732434b6..a0788d1cfa0 100644
--- a/sys/arch/powerpc/mac/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_obio.c,v 1.3 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: if_wi_obio.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/arch/powerpc/mac/keyboard.h b/sys/arch/macppc/dev/keyboard.h
index 76447f12bfb..8b6c1d5d36a 100644
--- a/sys/arch/powerpc/mac/keyboard.h
+++ b/sys/arch/macppc/dev/keyboard.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: keyboard.h,v 1.2 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: keyboard.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: keyboard.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/macintr.c b/sys/arch/macppc/dev/macintr.c
index 01ca36eb5e5..b3f3fbf99fc 100644
--- a/sys/arch/powerpc/mac/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macintr.c,v 1.14 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: macintr.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
diff --git a/sys/arch/powerpc/mac/mesh.c b/sys/arch/macppc/dev/mesh.c
index 2d68d3740f7..3b08fdde4e0 100644
--- a/sys/arch/powerpc/mac/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesh.c,v 1.3 2001/08/08 21:08:33 miod Exp $ */
+/* $OpenBSD: mesh.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/meshreg.h b/sys/arch/macppc/dev/meshreg.h
index 6704a738696..d710675b1f4 100644
--- a/sys/arch/powerpc/mac/meshreg.h
+++ b/sys/arch/macppc/dev/meshreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: meshreg.h,v 1.2 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: meshreg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: meshreg.h,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/openpic.c b/sys/arch/macppc/dev/openpic.c
index 1c6c197dc52..85bf783cf5c 100644
--- a/sys/arch/powerpc/mac/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpic.c,v 1.17 2001/07/09 04:41:28 mickey Exp $ */
+/* $OpenBSD: openpic.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -55,7 +55,7 @@
#include <machine/psl.h>
#include <machine/pio.h>
#include <machine/powerpc.h>
-#include <powerpc/mac/openpicreg.h>
+#include <macppc/mac/openpicreg.h>
#include <dev/ofw/openfirm.h>
#define ICU_LEN 128
diff --git a/sys/arch/powerpc/mac/openpicreg.h b/sys/arch/macppc/dev/openpicreg.h
index 80052b47db5..e4c0d715cd3 100644
--- a/sys/arch/powerpc/mac/openpicreg.h
+++ b/sys/arch/macppc/dev/openpicreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpicreg.h,v 1.2 2001/07/04 08:38:51 niklas Exp $ */
+/* $OpenBSD: openpicreg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: openpicreg.h,v 1.1 2000/02/14 12:45:53 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 61fba76c800..4ec07563fed 100644
--- a/sys/arch/powerpc/mac/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pm_direct.c,v 1.5 2001/08/18 21:22:09 drahn Exp $ */
+/* $OpenBSD: pm_direct.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/adbvar.h>
-#include <powerpc/mac/pm_direct.h>
-#include <powerpc/mac/viareg.h>
+#include <macppc/mac/adbvar.h>
+#include <macppc/mac/pm_direct.h>
+#include <macppc/mac/viareg.h>
extern int adb_polling; /* Are we polling? (Debugger mode) */
diff --git a/sys/arch/powerpc/mac/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h
index 08e6a7e6f09..f84d7f66b11 100644
--- a/sys/arch/powerpc/mac/pm_direct.h
+++ b/sys/arch/macppc/dev/pm_direct.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pm_direct.h,v 1.3 2001/07/04 08:38:52 niklas Exp $ */
+/* $OpenBSD: pm_direct.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: pm_direct.h,v 1.5 1999/07/12 15:54:55 tsubai Exp $ */
/*
diff --git a/sys/arch/powerpc/mac/uni_n.c b/sys/arch/macppc/dev/uni_n.c
index d1089e8c2ae..4d3e44efac5 100644
--- a/sys/arch/powerpc/mac/uni_n.c
+++ b/sys/arch/macppc/dev/uni_n.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uni_n.c,v 1.5 2001/06/29 06:55:36 drahn Exp $ */
+/* $OpenBSD: uni_n.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/*
* Copyright (c) 1998-2001 Dale Rahn. All rights reserved.
diff --git a/sys/arch/powerpc/mac/viareg.h b/sys/arch/macppc/dev/viareg.h
index ce48b7762c9..c034f7fb990 100644
--- a/sys/arch/powerpc/mac/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: viareg.h,v 1.3 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: viareg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */
/* $NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/mac/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index baf6528089a..f58cdec4372 100644
--- a/sys/arch/powerpc/mac/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_obio.c,v 1.10 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: wdc_obio.c,v 1.1 2001/09/01 15:50:00 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 <powerpc/mac/dbdma.h>
+#include <macppc/mac/dbdma.h>
#define WDC_REG_NPORTS 8
#define WDC_AUXREG_OFFSET 0x16