summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorAriane van der Steldt <ariane@cvs.openbsd.org>2009-05-07 11:30:28 +0000
committerAriane van der Steldt <ariane@cvs.openbsd.org>2009-05-07 11:30:28 +0000
commitfafe38bd094e3a643eaeee0713da3672120f6a7c (patch)
treeee6da62c994498f28d5a4adcab1dd67174c0e5fe /sys/arch/i386/conf/GENERIC
parentcaafa8002519442d0d9a9929c9dcce73c0576c5f (diff)
Move amas device from arch/amd64 to dev/pci and enable it in i386 as well.
amas defaults to disabled on both amd64 and i386. "Go for it!" kettenis@
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 03393729c17..e04f3a48d87 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.656 2009/04/24 21:28:41 mk Exp $
+# $OpenBSD: GENERIC,v 1.657 2009/05/07 11:30:26 ariane Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -92,6 +92,7 @@ glxpcib* at pci? # AMD CS5536 PCI-ISA bridge
gpio* at glxpcib?
kate* at pci? # AMD K8 temperature sensor
km* at pci? # AMD K10 temperature sensor
+amas* at pci? disable # AMD memory configuration
# power management and other environmental stuff
elansc* at pci? # AMD Elan SC520 System Controller