summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale S. Rahn <rahnds@cvs.openbsd.org>1998-10-11 20:51:40 +0000
committerDale S. Rahn <rahnds@cvs.openbsd.org>1998-10-11 20:51:40 +0000
commit48f4d7030532c7cdfa793670cf6ef801ea00e554 (patch)
treecd3fd0fb64fd818bb45ceaa13efac87abe768540
parentb25b6abb86b7987aa1119c6a1cb02c38382b85dc (diff)
When copying several lines from one file to another, do not delete the lines
from the first file. (the last commit of this file had several lines missing.)
-rw-r--r--sys/arch/powerpc/conf/GENERIC23
1 files changed, 22 insertions, 1 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index ca1c9218aec..06267ceacb6 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.8 1998/10/10 06:31:30 rahnds Exp $
+# $OpenBSD: GENERIC,v 1.9 1998/10/11 20:51:39 rahnds Exp $
#
# PPC GENERIC config file
#
@@ -19,6 +19,27 @@ include "../../../conf/GENERIC"
config bsd swap generic
+#
+# Now the Machine specification
+#
+mainbus0 at root
+cpu* at mainbus0
+
+ofroot* at mainbus0
+mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
+isabr* at pci? # ISA dev bridge.
+mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
+isabr* at mainbus0 # ISA dev bridge.
+
+#### PCI Bus devices.
+
+pci* at mpcpcibr?
+ncr* at pci? dev ? function ?
+scsibus* at ncr?
+de* at pci? dev ? function ?
+#vme* at pci? dev ? function ?
+vga* at pci? dev ? function ? # PCI VGA graphics
+vgafb0 at pci? dev ? function ? # PCI VGA graphics
#### ISA Bus devices.