diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a945e1295b2..8933280aab2 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.497 2006/05/27 19:10:43 dlg Exp $ +# $OpenBSD: GENERIC,v 1.498 2006/05/28 17:21:14 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -241,6 +241,10 @@ ural* at uhub? # Ralink RT2500 udcf* at uhub? # Gude Expert mouseCLOCK puc* at pci? # PCI "universal" communication device +sdhc* at pci? # SD Host Controller +sdmmc* at sdhc? # SD/MMC bus +scsibus* at sdmmc? # SCSI emulation + npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? isapnp0 at isa? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 2feff89137d..3fbcde421ec 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.146 2006/05/01 17:01:14 kettenis Exp $ +# $OpenBSD: files.i386,v 1.147 2006/05/28 17:21:14 uwe Exp $ # # new style config file for i386 architecture # @@ -401,6 +401,11 @@ include "dev/gpio/files.gpio" # include "dev/onewire/files.onewire" +# +# Machine-independent SD/MMC drivers +# +include "dev/sdmmc/files.sdmmc" + include "../../../dev/acpi/files.acpi" file arch/i386/i386/acpi_machdep.c acpi |