summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-04-16 09:09:50 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-04-16 09:09:50 +0000
commit1c568db95bdbeab9ebe9113884e907b9cfa3c6ba (patch)
treee5ef9855add2230fca2d07d3830f484726016ca5
parentf49b145785b8db50798a06d26eeac6bf6917b759 (diff)
Enable ualea(4) where we have uhub(4), these USB device lists cry for
unification...
-rw-r--r--sys/arch/alpha/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/armish/conf/GENERIC3
-rw-r--r--sys/arch/armv7/conf/GENERIC-IMX3
-rw-r--r--sys/arch/armv7/conf/GENERIC-OMAP3
-rw-r--r--sys/arch/armv7/conf/GENERIC-SUNXI3
-rw-r--r--sys/arch/hppa/conf/GENERIC3
-rw-r--r--sys/arch/hppa64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/landisk/conf/GENERIC3
-rw-r--r--sys/arch/loongson/conf/GENERIC3
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP273
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP303
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP323
-rw-r--r--sys/arch/sparc64/conf/GENERIC3
-rw-r--r--sys/arch/zaurus/conf/GENERIC7
17 files changed, 36 insertions, 19 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index f480d1857e4..624c4d19778 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.253 2015/03/24 12:00:39 dlg Exp $
+# $OpenBSD: GENERIC,v 1.254 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -63,6 +63,7 @@ usb* at ohci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 1ebb8a6e065..c49e8938216 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.386 2015/04/02 14:24:02 jasper Exp $
+# $OpenBSD: GENERIC,v 1.387 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -176,6 +176,7 @@ usb* at ohci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 3518d5797a3..a5944c08224 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.58 2015/01/03 21:24:19 uaa Exp $
+# $OpenBSD: GENERIC,v 1.59 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -90,6 +90,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/armv7/conf/GENERIC-IMX b/sys/arch/armv7/conf/GENERIC-IMX
index 3419b0fa819..4276c42b46a 100644
--- a/sys/arch/armv7/conf/GENERIC-IMX
+++ b/sys/arch/armv7/conf/GENERIC-IMX
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IMX,v 1.11 2015/01/04 20:55:38 uaa Exp $
+# $OpenBSD: GENERIC-IMX,v 1.12 2015/04/16 09:09:49 mpi Exp $
#
# GENERIC machine description file
#
@@ -83,6 +83,7 @@ uhub* at uhub?
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/armv7/conf/GENERIC-OMAP b/sys/arch/armv7/conf/GENERIC-OMAP
index 0d085eaf570..c31c91ef8ad 100644
--- a/sys/arch/armv7/conf/GENERIC-OMAP
+++ b/sys/arch/armv7/conf/GENERIC-OMAP
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-OMAP,v 1.14 2015/01/04 20:55:38 uaa Exp $
+# $OpenBSD: GENERIC-OMAP,v 1.15 2015/04/16 09:09:49 mpi Exp $
#
# GENERIC machine description file
#
@@ -97,6 +97,7 @@ uhub* at uhub?
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/armv7/conf/GENERIC-SUNXI b/sys/arch/armv7/conf/GENERIC-SUNXI
index 2225865293d..8db66cf173f 100644
--- a/sys/arch/armv7/conf/GENERIC-SUNXI
+++ b/sys/arch/armv7/conf/GENERIC-SUNXI
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-SUNXI,v 1.12 2015/01/04 20:55:38 uaa Exp $
+# $OpenBSD: GENERIC-SUNXI,v 1.13 2015/04/16 09:09:49 mpi Exp $
#
# GENERIC machine description file
#
@@ -85,6 +85,7 @@ usb* at ehci? #flags 0x1
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 848970bc49f..f9751ccc89f 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.168 2015/01/03 21:24:19 uaa Exp $
+# $OpenBSD: GENERIC,v 1.169 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -119,6 +119,7 @@ url* at uhub? # Realtek RTL8150L based adapters
rsu* at uhub? # Realtek RTL8188SU/RTL8191SU/RTL8192SU
# untested USB devices
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index ca701439dce..57865797a44 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.35 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.36 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -59,6 +59,7 @@ com1 at ssio? irq 3
# USB devices
#uhub* at usb? # USB Hubs
#uhub* at uhub? # USB Hubs
+#ualea* at uhub? # Araneus Alea II TRNG
#umodem* at uhub? # USB Modems/Serial
#ucom* at umodem?
#uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2fd961201e3..9c632927382 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.796 2015/04/02 14:24:02 jasper Exp $
+# $OpenBSD: GENERIC,v 1.797 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -229,6 +229,7 @@ usb* at ohci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 3c241fb7f34..f3b2f8b9dfa 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.48 2015/01/03 21:24:19 uaa Exp $
+# $OpenBSD: GENERIC,v 1.49 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -86,6 +86,7 @@ usb* at ohci?
# USB Hubs
uhub* at usb?
uhub* at uhub? port ? configuration ? interface ?
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 7b8922e67d8..93599c10c77 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.49 2015/04/02 14:24:02 jasper Exp $
+# $OpenBSD: GENERIC,v 1.50 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -95,6 +95,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 374d5471763..f16b194713e 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.248 2015/04/02 14:24:02 jasper Exp $g
+# $OpenBSD: GENERIC,v 1.249 2015/04/16 09:09:49 mpi Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -205,6 +205,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index c5295003ffa..4aab49411d8 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.59 2015/01/03 21:43:42 uaa Exp $
+# $OpenBSD: GENERIC-IP27,v 1.60 2015/04/16 09:09:49 mpi Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -106,6 +106,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index a673608cc74..4b6726c2a42 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.52 2015/01/03 21:43:42 uaa Exp $
+# $OpenBSD: GENERIC-IP30,v 1.53 2015/04/16 09:09:49 mpi Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -97,6 +97,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index 956752bbf01..bc9eea17604 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.43 2015/01/03 21:43:42 uaa Exp $
+# $OpenBSD: GENERIC-IP32,v 1.44 2015/04/16 09:09:49 mpi Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -89,6 +89,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index bf35c433b80..fbb443664f1 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.298 2015/03/24 12:00:39 dlg Exp $
+# $OpenBSD: GENERIC,v 1.299 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -173,6 +173,7 @@ usb* at xhci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index ee5e2e5d32f..6ee47660390 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.98 2015/01/03 21:24:19 uaa Exp $
+# $OpenBSD: GENERIC,v 1.99 2015/04/16 09:09:49 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -66,10 +66,11 @@ cdcef* at usbf? # CDC ethernet function
# USB bus support
usb* at ohci?
-uhub* at usb? # USB Root Hub
-uhub* at uhub? # USB Hub
# USB devices
+uhub* at usb? # USB Root Hub
+uhub* at uhub? # USB Hub
+ualea* at uhub? # Araneus Alea II TRNG
umodem* at uhub? # USB Modems/Serial
ucom* at umodem?
uvisor* at uhub? # Handspring Visor