summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 41d1b37931c..290b048801b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.623 2008/06/15 15:34:57 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.624 2008/06/15 16:34:08 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -45,7 +45,7 @@ acpi0 at bios?
pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
ipmi0 at mainbus? # IPMI
esm0 at mainbus? # Dell Embedded Server Management
-amdmsr0 at mainbus? # AMD MSR access
+amdmsr0 at mainbus? disable # AMD MSR access
acpitimer* at acpi?
acpihpet* at acpi?