summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/files.i3867
2 files changed, 8 insertions, 2 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
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index f805def876d..9a32b6c71b0 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.188 2009/01/20 20:21:03 mlarkin Exp $
+# $OpenBSD: files.i386,v 1.189 2009/05/07 11:30:26 ariane Exp $
#
# new style config file for i386 architecture
#
@@ -106,6 +106,11 @@ device pchb: pcibus, agpbus
attach pchb at pci
file arch/i386/pci/pchb.c pchb
+# AMAS AMD memory address switch
+device amas
+attach amas at pci
+file dev/pci/amas.c amas
+
# AGP bridge support. most attach at pchb
include "dev/pci/files.agp"
file arch/i386/pci/agp_machdep.c agp