summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-05-29 01:06:27 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-05-29 01:06:27 +0000
commitdcebce3c1b1a2615c854d95091b20ee6520737ca (patch)
treed316b3a1ec79302a1b8b15e5823a281a88e84ddc /sys/arch/amd64/conf
parentd30841b1bfa3d14ab787f2bbe0c0a23f070c28a1 (diff)
Enable sdmmc on amd64 too. ok brad@, deraadt@.
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/amd64/conf/files.amd647
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a3d00f49370..6e8c3fc43f7 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.136 2006/05/29 00:59:24 canacar Exp $
+# $OpenBSD: GENERIC,v 1.137 2006/05/29 01:06:26 matthieu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -193,6 +193,10 @@ ural* at uhub? # Ralink RT2500
puc* at pci? # PCI "universal" communication device
+sdhc* at pci? # SD Host Controller
+sdmmc* at sdhc? # SD/MMC bus
+scsibus* at sdmmc? # SCSI emulation
+
isadma0 at isa?
option WSDISPLAY_COMPAT_USL # VT handling
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index ce1caf427b6..9f06155b6d9 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.22 2006/05/08 22:51:18 gwk Exp $
+# $OpenBSD: files.amd64,v 1.23 2006/05/29 01:06:26 matthieu Exp $
maxpartitions 16
maxusers 2 16 128
@@ -179,6 +179,11 @@ include "../../../dev/acpi/files.acpi"
file arch/amd64/amd64/acpi_machdep.c acpi
#
+# Machine-independent SD/MMC drivers
+#
+include "dev/sdmmc/files.sdmmc"
+
+#
# IPMI
#
attach ipmi at mainbus