summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2012-10-08 17:26:02 +0000
committerderaadt <deraadt@openbsd.org>2012-10-08 17:26:02 +0000
commit770f2f0eb2881226b774356e9d136b84f187e9c9 (patch)
tree6efdfc16d99a968a7ac0174ad29148f746aff841
parentProtect vnode.h from multiple inclusions. (diff)
downloadwireguard-openbsd-770f2f0eb2881226b774356e9d136b84f187e9c9.tar.xz
wireguard-openbsd-770f2f0eb2881226b774356e9d136b84f187e9c9.zip
enable 3 new OAK usb sensors on at least two architectures
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a415ab90a90..12306a865cb 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.333 2012/09/27 14:01:35 jsg Exp $
+# $OpenBSD: GENERIC,v 1.334 2012/10/08 17:26:02 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -251,6 +251,9 @@ uthum* at uhidev? # TEMPerHUM sensor
utrh* at uhidev? # USBRH sensor
utwitch* at uhidev? # YUREX BBU sensor
uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter
+uoakrh* at uhidev? # Toradex OAK temp and rel humidity
+uoaklux* at uhidev? # Toradex OAK LUX
+uoakv* at uhidev? # Toradex OAK 10V sensor
onewire* at uow?
uvideo* at uhub? # USB Video
video* at uvideo?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4e53aac0b6f..0c7d0e12130 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.740 2012/09/27 14:01:35 jsg Exp $
+# $OpenBSD: GENERIC,v 1.741 2012/10/08 17:26:02 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -308,6 +308,9 @@ uthum* at uhidev? # TEMPerHUM sensor
utrh* at uhidev? # USBRH sensor
utwitch* at uhidev? # YUREX BBU sensor
uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter
+uoakrh* at uhidev? # Toradex OAK temp and rel humidity
+uoaklux* at uhidev? # Toradex OAK LUX
+uoakv* at uhidev? # Toradex OAK 10V sensor
onewire* at uow?
uvideo* at uhub? # USB video
video* at uvideo?