- Allow duplicate "machine" directives with the same arguments.

- Move existing "machine" directives to DEFAULTS.

4 files changed, 1 insertions, 10 deletions

diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index 0250c0c..e4fe155 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -3,8 +3,7 @@
 #
 # $FreeBSD$
 
-# Not yet, this would break all existing configs
-#machine		ia64
+machine		ia64
 
 # Bus support.
 device 		acpi		# ACPI support
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 2e457ab..0c77673 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -20,7 +20,6 @@
 #
 # $FreeBSD$
 
-machine		ia64
 cpu		ITANIUM
 ident		GENERIC
 
diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES
index 289f576..64f34e6 100644
--- a/sys/ia64/conf/NOTES
+++ b/sys/ia64/conf/NOTES
@@ -3,12 +3,6 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 
-# directive: machine
-# This directive is mandatory.  It defines the architecture to be configured
-# for. It can only be ia64 at this time.
-#
-machine		ia64
-
 # directive: cpu
 # You must specify at least one CPU (the one you intend to run on). Deleting
 # the support for CPUs you don't need to use may make parts of the system run
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 53bc681..0ca9a71 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -19,7 +19,6 @@
 #
 # $FreeBSD$
 
-machine 	ia64
 cpu		ITANIUM
 ident		SKI