summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2008-06-20 05:13:02 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2008-06-20 05:13:02 +0000
commit33767528bac6a207de7273f8612c0b0017294eac (patch)
tree91b891d93882cf66314b3b8cacdf5e322fe0aa13
parentb04fefbc662e23ff7680ea5223fea4ddae29f392 (diff)
Re-enable amdmsr(4) now that it properly checks for AMD Geode LX CPU and
the presence of the graphics processor. ok deraadt
-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 b90bb6e69a7..f3d65c21430 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.627 2008/06/19 15:37:28 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.628 2008/06/20 05:13:01 mbalmer 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? disable # AMD MSR access
+amdmsr0 at mainbus? # MSR access for AMD Geode LX CPUs with GP
acpitimer* at acpi?
acpihpet* at acpi?