summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-03-24 10:39:09 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-03-24 10:39:09 +0000
commit4c35b4e1ed738af1b048a50a166284fe88d876e7 (patch)
tree0ca63cb6ddb7015b1902b231d999f728139acefb /sys
parent99f5f5fd692ef56a3537876641d93cecefb342aa (diff)
Enable umsm(4) on archs that support CardBus.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/GENERIC4
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 2e3ee96a249..cc02d6a5b57 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.118 2006/03/12 17:29:48 martin Exp $
+# $OpenBSD: GENERIC,v 1.119 2006/03/24 10:39:07 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -147,6 +147,8 @@ umct* at uhub? # MCT USB-RS232 serial adapter
ucom* at umct?
uipaq* at uhub? # iPAQ serial adapter
ucom* at uipaq?
+umsm* at uhub? # Qualcomm MSM EVDO
+ucom* at umsm?
uaudio* at uhub? # USB Audio
audio* at uaudio?
umidi* at uhub? # USB MIDI
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a02f1e9e63e..08ffb417937 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.476 2006/03/12 17:29:48 martin Exp $
+# $OpenBSD: GENERIC,v 1.477 2006/03/24 10:39:08 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -195,6 +195,8 @@ umct* at uhub? # MCT USB-RS232 serial adapter
ucom* at umct?
uipaq* at uhub? # iPAQ serial adapter
ucom* at uipaq?
+umsm* at uhub? # Qualcomm MSM EVDO
+ucom* at umsm?
uaudio* at uhub? # USB Audio
audio* at uaudio?
umidi* at uhub? # USB MIDI
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 3984352020a..c93178d0591 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.127 2006/02/14 18:11:04 miod Exp $g
+# $OpenBSD: GENERIC,v 1.128 2006/03/24 10:39:08 jsg Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -214,6 +214,8 @@ umct* at uhub? # MCT USB-RS232 serial adapter
ucom* at umct?
uipaq* at uhub? # iPAQ serial adapter
ucom* at uipaq?
+umsm* at uhub? # Qualcomm MSM EVDO
+ucom* at umsm?
uaudio* at uhub? # USB Audio
audio* at uaudio?
umidi* at uhub? # USB MIDI