diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index c8ea61ce2fee..c731a40d3651 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.262 2010/01/07 18:49:30 tnn Exp $ +# $NetBSD: GENERIC,v 1.263 2010/01/31 12:20:22 jruoho 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.262 $" +#ident "GENERIC-$Revision: 1.263 $" maxusers 64 # estimated number of users @@ -264,7 +264,6 @@ options MPBIOS_SCANPCI # MPBIOS configures PCI roots #options PCI_BUS_FIXUP # fixup PCI bus numbering #options PCI_ADDR_FIXUP # fixup PCI I/O addresses #options ACPI_ACTIVATE_DEV # If set, activate inactive devices -#options ACPICA_PEDANTIC # force strict conformance to the Spec. options VGA_POST # in-kernel support for VGA POST # ACPI devices