From d0750fb9b07b7b37ec9c8f66eb804c6041b9e91c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 21 Nov 2005 20:17:46 +0000
Subject: [PATCH] Create DEFAULTS files for alpha, ia64, powerpc, and sparc64
 and move 'device mem' over from GENERIC to DEFAULTS to be consistent with
 i386 and amd64.  Additionally, on ia64 enable ACPI by default since ia64
 requires acpi.

---
 sys/alpha/conf/DEFAULTS   | 10 ++++++++++
 sys/alpha/conf/GENERIC    |  1 -
 sys/ia64/conf/DEFAULTS    | 13 +++++++++++++
 sys/ia64/conf/GENERIC     |  2 --
 sys/powerpc/conf/DEFAULTS | 10 ++++++++++
 sys/powerpc/conf/GENERIC  |  1 -
 sys/sparc64/conf/DEFAULTS | 10 ++++++++++
 sys/sparc64/conf/GENERIC  |  1 -
 8 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 sys/alpha/conf/DEFAULTS
 create mode 100644 sys/ia64/conf/DEFAULTS
 create mode 100644 sys/powerpc/conf/DEFAULTS
 create mode 100644 sys/sparc64/conf/DEFAULTS

diff --git a/sys/alpha/conf/DEFAULTS b/sys/alpha/conf/DEFAULTS
new file mode 100644
index 00000000000..c199be22969
--- /dev/null
+++ b/sys/alpha/conf/DEFAULTS
@@ -0,0 +1,10 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/alpha
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		alpha
+
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 2be16f3b2c2..cab4e453e69 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -183,7 +183,6 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
new file mode 100644
index 00000000000..331061d78e4
--- /dev/null
+++ b/sys/ia64/conf/DEFAULTS
@@ -0,0 +1,13 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/ia64
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		ia64
+
+# Bus support.
+device 		acpi		# ACPI support
+
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 560e92d449c..2e457ab0bdc 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -56,7 +56,6 @@ options 	UFS_DIRHASH	# Hash-based directory lookup scheme
 options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
 
 # Various "busses"
-device 		acpi		# ACPI support (mandatory)
 device		firewire	# FireWire bus code
 device		miibus		# MII bus support (Ethernet)
 device		pci		# PCI bus support
@@ -141,7 +140,6 @@ device		faith		# IPv6-to-IPv4 relaying (translation)
 device		gif		# IPv6 and IPv4 tunneling
 device		loop		# Network loopback
 device		md		# Memory "disks"
-device		mem		# Memory and kernel memory devices
 device		pty		# Pseudo-ttys (telnet etc)
 device		puc		# Multi I/O cards and multi-channel UARTs
 device		random		# Entropy device
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
new file mode 100644
index 00000000000..bd4ddb894a1
--- /dev/null
+++ b/sys/powerpc/conf/DEFAULTS
@@ -0,0 +1,10 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/powerpc
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		powerpc
+
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 53ca3dfb5f4..3dfd5db459a 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -104,7 +104,6 @@ device 		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
new file mode 100644
index 00000000000..087ee1d49bc
--- /dev/null
+++ b/sys/sparc64/conf/DEFAULTS
@@ -0,0 +1,10 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/sparc64
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		sparc64
+
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 73a13c1803c..84968dd7fd2 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -186,7 +186,6 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP