summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
committerru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
commit9fa3a162bcf8544009ef55b3e84fb3e19396c953 (patch)
treea8f69b1f507a116aae9c4e4acdd1eb1f1271bb93 /sys/powerpc
parent0b4ce8e3e1cb11709c2122272d006774ad389a59 (diff)
downloadFreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.zip
FreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.tar.gz
- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/conf/DEFAULTS3
-rw-r--r--sys/powerpc/conf/GENERIC1
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index bd4ddb8..4534868 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -3,8 +3,7 @@
#
# $FreeBSD$
-# Not yet, this would break all existing configs
-#machine powerpc
+machine powerpc
# Pseudo devices.
device mem # Memory and kernel memory devices
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 3dfd5db..b0c4213 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine powerpc
cpu OEA
ident GENERIC
OpenPOWER on IntegriCloud