summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/files.amd64
diff options
context:
space:
mode:
authorJoshua Stein <jcs@cvs.openbsd.org>2016-01-08 15:54:15 +0000
committerJoshua Stein <jcs@cvs.openbsd.org>2016-01-08 15:54:15 +0000
commit7fd88a74dd552b0096c543e413327fbfb350ef80 (patch)
tree2ce2a269aaed833603cb04a343aa3c5e0049d0e8 /sys/arch/amd64/conf/files.amd64
parentd24eef6904e463e49210a1e3bc560a2fe852dcbe (diff)
Move HID support files out of dev/usb into new dev/hid directory
These files aren't USB-specific and were used by the previous Bluetooth implementation, and will be used by the upcoming HID-over-i2C implementation ok deraadt previous version ok kettenis and mpi
Diffstat (limited to 'sys/arch/amd64/conf/files.amd64')
-rw-r--r--sys/arch/amd64/conf/files.amd647
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 4792548fd9c..5d58b343c4a 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.84 2015/11/23 22:57:12 deraadt Exp $
+# $OpenBSD: files.amd64,v 1.85 2016/01/08 15:54:13 jcs Exp $
maxpartitions 16
maxusers 2 16 128
@@ -205,6 +205,11 @@ pseudo-device nvram
file arch/amd64/amd64/nvram.c nvram needs-flag
#
+# Machine-independent HID support
+#
+include "dev/hid/files.hid"
+
+#
# USB
#
include "dev/usb/files.usb"