Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR 31996: fix the comments for MPBIOS and MPACPI. By Damon Brodie.

This commit is contained in:
rpaulo 2005-11-03 23:12:16 +00:00
parent 8af62fd627
commit 3de46f226c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.71 2005/09/14 08:22:24 tron Exp $
# $NetBSD: GENERIC,v 1.72 2005/11/03 23:12:16 rpaulo Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.71 $"
#ident "GENERIC-$Revision: 1.72 $"
maxusers 32 # estimated number of users
@ -229,8 +229,11 @@ config netbsd root on ? type ?
mainbus0 at root
#acpi0 at mainbus0
#options MPACPI
#options MPACPI_SCANPCI # MPBIOS configures PCI roots
#options MPACPI # configure CPUs and APICs using ACPI
# (acpi at mainbus must also be enabled)
#options MPACPI_SCANPCI # find PCI roots using MPACPI
options MPBIOS # configure CPUs and APICs using MPBIOS
options MPBIOS_SCANPCI # MPBIOS configures PCI roots
#options PCI_INTR_FIXUP # PCI interrupt routing via ACPI
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
@ -255,8 +258,6 @@ mainbus0 at root
#pcppi* at acpi? # AT-style speaker sound
#wss* at acpi? # NeoMagic 256AV in wss mode
options MPBIOS
options MPBIOS_SCANPCI # MPBIOS configures PCI roots
cpu* at mainbus?
ioapic* at mainbus? apid ?