summaryrefslogtreecommitdiffstats
path: root/sys/ia64/conf
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-11-21 20:17:46 +0000
committerjhb <jhb@FreeBSD.org>2005-11-21 20:17:46 +0000
commit23a1490fe0d92113b63777d239427f7107d9700e (patch)
tree5fa148ccf4fa403950461b7e8a7fe93b2c584856 /sys/ia64/conf
parentbef2e3c846f9290b3e3d31c3c5e4c2bf13b22e2b (diff)
downloadFreeBSD-src-23a1490fe0d92113b63777d239427f7107d9700e.zip
FreeBSD-src-23a1490fe0d92113b63777d239427f7107d9700e.tar.gz
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.
Diffstat (limited to 'sys/ia64/conf')
-rw-r--r--sys/ia64/conf/DEFAULTS13
-rw-r--r--sys/ia64/conf/GENERIC2
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
new file mode 100644
index 0000000..331061d
--- /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 560e92d..2e457ab 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
OpenPOWER on IntegriCloud