summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-07-09 06:33:19 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-07-09 06:33:19 +0000
commit387193d989db50eaa0001cff438e966b1f15ae0c (patch)
treea49caacf414c04e062e52a968a3d222090c8c0b8 /sys/arch
parente57685c4530485e61c0d1c56e09c61f0c6de6ea7 (diff)
unify com at cardbus attachments
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index b37c0beb384..dc08f5eed27 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.328 2012/05/27 12:36:24 jsg Exp $
+# $OpenBSD: GENERIC,v 1.329 2012/07/09 06:33:18 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -257,7 +257,7 @@ udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
puc* at pci? # PCI "universal" communication device
-#puc* at cardbus?
+com* at cardbus?
sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a0897637f11..fa16443676b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.734 2012/05/27 12:36:24 jsg Exp $
+# $OpenBSD: GENERIC,v 1.735 2012/07/09 06:33:18 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -313,7 +313,7 @@ udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
puc* at pci? # PCI "universal" communication device
-#puc* at cardbus?
+com* at cardbus?
sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus