summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/macppc/pci/macobio.c (renamed from sys/arch/powerpc/pci/macobio.c)2
-rw-r--r--sys/arch/macppc/pci/mpc106reg.h (renamed from sys/arch/powerpc/pci/mpc106reg.h)2
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c (renamed from sys/arch/powerpc/pci/mpcpcibus.c)6
-rw-r--r--sys/arch/macppc/pci/pchb.c (renamed from sys/arch/powerpc/pci/pchb.c)2
-rw-r--r--sys/arch/macppc/pci/pci_vga.c (renamed from sys/arch/powerpc/pci/pci_vga.c)2
-rw-r--r--sys/arch/macppc/pci/pcibrvar.h (renamed from sys/arch/powerpc/pci/pcibrvar.h)2
-rw-r--r--sys/arch/macppc/pci/pciide_machdep.c (renamed from sys/arch/powerpc/pci/pciide_machdep.c)4
-rw-r--r--sys/arch/macppc/pci/vgafb.c (renamed from sys/arch/powerpc/pci/vgafb.c)4
-rw-r--r--sys/arch/macppc/pci/vgafb_pci.c (renamed from sys/arch/powerpc/pci/vgafb_pci.c)6
-rw-r--r--sys/arch/macppc/pci/vgafb_pcivar.h (renamed from sys/arch/powerpc/pci/vgafb_pcivar.h)2
-rw-r--r--sys/arch/macppc/pci/vgafbvar.h (renamed from sys/arch/powerpc/pci/vgafbvar.h)2
11 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/powerpc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index 56fda5f66f4..3d22477a3e0 100644
--- a/sys/arch/powerpc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macobio.c,v 1.16 2001/07/09 02:56:09 mickey Exp $ */
+/* $OpenBSD: macobio.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/* $NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/pci/mpc106reg.h b/sys/arch/macppc/pci/mpc106reg.h
index 3a488d2e659..8524c1ef4d8 100644
--- a/sys/arch/powerpc/pci/mpc106reg.h
+++ b/sys/arch/macppc/pci/mpc106reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpc106reg.h,v 1.6 2000/03/20 07:10:50 rahnds Exp $ */
+/* $OpenBSD: mpc106reg.h,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
diff --git a/sys/arch/powerpc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 6cd085d9ac7..1af30ef6f8d 100644
--- a/sys/arch/powerpc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.33 2001/08/17 22:26:58 mickey Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -58,8 +58,8 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
-#include <powerpc/pci/pcibrvar.h>
-#include <powerpc/pci/mpc106reg.h>
+#include <macppc/pci/pcibrvar.h>
+#include <macppc/pci/mpc106reg.h>
#include <dev/ofw/openfirm.h>
extern vm_map_t phys_map;
diff --git a/sys/arch/powerpc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index b64315ceafb..6b3f4b02a2a 100644
--- a/sys/arch/powerpc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.5 2001/07/04 08:38:52 niklas Exp $ */
+/* $OpenBSD: pchb.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */
/*-
diff --git a/sys/arch/powerpc/pci/pci_vga.c b/sys/arch/macppc/pci/pci_vga.c
index c3fa7ff9c58..c0de87366fc 100644
--- a/sys/arch/powerpc/pci/pci_vga.c
+++ b/sys/arch/macppc/pci/pci_vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_vga.c,v 1.1 1997/10/11 11:29:31 pefo Exp $ */
+/* $OpenBSD: pci_vga.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
diff --git a/sys/arch/powerpc/pci/pcibrvar.h b/sys/arch/macppc/pci/pcibrvar.h
index b148b3929d3..134373fdc7f 100644
--- a/sys/arch/powerpc/pci/pcibrvar.h
+++ b/sys/arch/macppc/pci/pcibrvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcibrvar.h,v 1.8 2001/06/25 23:30:00 drahn Exp $ */
+/* $OpenBSD: pcibrvar.h,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
diff --git a/sys/arch/powerpc/pci/pciide_machdep.c b/sys/arch/macppc/pci/pciide_machdep.c
index f82b6ee9888..2af6c35e1e5 100644
--- a/sys/arch/powerpc/pci/pciide_machdep.c
+++ b/sys/arch/macppc/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide_machdep.c,v 1.1 2001/06/26 21:26:45 drahn Exp $ */
+/* $OpenBSD: pciide_machdep.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/* $NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $ */
/*
@@ -50,7 +50,7 @@
#include <dev/pci/pciidereg.h>
#include <dev/pci/pciidevar.h>
-#include <powerpc/autoconf.h>
+#include <machine/autoconf.h>
void *
pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
diff --git a/sys/arch/powerpc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index b6ed51b5627..788bc3569ae 100644
--- a/sys/arch/powerpc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb.c,v 1.14 2001/07/09 03:54:40 mickey Exp $ */
+/* $OpenBSD: vgafb.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
/* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */
/*
@@ -47,7 +47,7 @@
#include <dev/wscons/wscons_raster.h>
#include <dev/rcons/raster.h>
-#include <arch/powerpc/pci/vgafbvar.h>
+#include <arch/macppc/pci/vgafbvar.h>
/* parameters set by OF to detect console */
extern int cons_displaytype;
diff --git a/sys/arch/powerpc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c
index 6bb4eab89ec..f458fcdfe10 100644
--- a/sys/arch/powerpc/pci/vgafb_pci.c
+++ b/sys/arch/macppc/pci/vgafb_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb_pci.c,v 1.5 2001/07/09 03:54:40 mickey Exp $ */
+/* $OpenBSD: vgafb_pci.c,v 1.1 2001/09/01 15:55:18 drahn Exp $ */
/* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */
/*
@@ -49,8 +49,8 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_raster.h>
-#include <arch/powerpc/pci/vgafbvar.h>
-#include <arch/powerpc/pci/vgafb_pcivar.h>
+#include <arch/macppc/pci/vgafbvar.h>
+#include <arch/macppc/pci/vgafb_pcivar.h>
#define PCI_VENDORID(x) ((x) & 0xFFFF)
#define PCI_CHIPID(x) (((x) >> 16) & 0xFFFF)
diff --git a/sys/arch/powerpc/pci/vgafb_pcivar.h b/sys/arch/macppc/pci/vgafb_pcivar.h
index feb61954d3a..9639905ccd5 100644
--- a/sys/arch/powerpc/pci/vgafb_pcivar.h
+++ b/sys/arch/macppc/pci/vgafb_pcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb_pcivar.h,v 1.2 2000/11/21 02:03:45 deraadt Exp $ */
+/* $OpenBSD: vgafb_pcivar.h,v 1.1 2001/09/01 15:55:18 drahn Exp $ */
/* $NetBSD: vga_pcivar.h,v 1.1 1996/11/19 04:38:36 cgd Exp $ */
/*
diff --git a/sys/arch/powerpc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h
index 726812e7d76..f8ba388c48c 100644
--- a/sys/arch/powerpc/pci/vgafbvar.h
+++ b/sys/arch/macppc/pci/vgafbvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafbvar.h,v 1.3 2001/07/09 03:54:41 mickey Exp $ */
+/* $OpenBSD: vgafbvar.h,v 1.1 2001/09/01 15:55:18 drahn Exp $ */
/* $NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $ */
/*