summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 02100db8da2..0e9ed45e316 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.241 2008/09/29 13:13:35 jsg Exp $
+# $OpenBSD: GENERIC,v 1.242 2008/10/08 00:19:36 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -134,6 +134,7 @@ pcmcia* at cardslot?
ehci* at pci? # Enhanced Host Controller
ehci* at cardbus? # Enhanced Host Controller
uhci* at pci? # Universal Host Controller (Intel)
+uhci* at cardbus? # Universal Host Controller (Intel)
ohci* at pci? # Open Host Controller
ohci* at cardbus? # Open Host Controller
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 9b70ae3caf2..4030e1dcb97 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.634 2008/09/29 13:13:35 jsg Exp $
+# $OpenBSD: GENERIC,v 1.635 2008/10/08 00:19:34 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -193,6 +193,7 @@ cardslot* at cbb?
ehci* at pci? # Enhanced Host Controller
ehci* at cardbus? # Enhanced Host Controller
uhci* at pci? # Universal Host Controller (Intel)
+uhci* at cardbus? # Universal Host Controller (Intel)
ohci* at pci? # Open Host Controller
ohci* at cardbus? # Open Host Controller