From 3de46f226c1376a1c3b4ec96f32eb1bcee5209b0 Mon Sep 17 00:00:00 2001
From: rpaulo <rpaulo@NetBSD.org>
Date: Thu, 3 Nov 2005 23:12:16 +0000
Subject: [PATCH] PR 31996: fix the comments for MPBIOS and MPACPI. By Damon
 Brodie.

---
 sys/arch/amd64/conf/GENERIC | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 907a8ad6a624..c7019cd19656 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -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 ?