summaryrefslogtreecommitdiff
path: root/sys/arch/loongson
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/loongson
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/loongson')
-rw-r--r--sys/arch/loongson/conf/files.loongson3
-rw-r--r--sys/arch/loongson/dev/kb3310.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index 8a8e1dd7066..4c8e628bae3 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: files.loongson,v 1.20 2015/08/15 22:31:38 miod Exp $
+# $OpenBSD: files.loongson,v 1.21 2016/01/08 15:54:13 jcs Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -35,6 +35,7 @@ include "dev/ata/files.ata"
include "dev/atapiscsi/files.atapiscsi"
include "dev/i2c/files.i2c"
include "dev/gpio/files.gpio"
+include "dev/hid/files.hid"
include "dev/isa/files.isa"
include "dev/isa/files.isapnp"
include "dev/mii/files.mii"
diff --git a/sys/arch/loongson/dev/kb3310.c b/sys/arch/loongson/dev/kb3310.c
index d670090cf8a..ad4d197a685 100644
--- a/sys/arch/loongson/dev/kb3310.c
+++ b/sys/arch/loongson/dev/kb3310.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kb3310.c,v 1.19 2013/12/24 01:11:04 dlg Exp $ */
+/* $OpenBSD: kb3310.c,v 1.20 2016/01/08 15:54:13 jcs Exp $ */
/*
* Copyright (c) 2010 Otto Moerbeek <otto@drijf.net>
*
@@ -39,7 +39,7 @@
#if NPCKBD > 0 || NHIDKBD > 0
#include <dev/ic/pckbcvar.h>
#include <dev/pckbc/pckbdvar.h>
-#include <dev/usb/hidkbdvar.h>
+#include <dev/hid/hidkbdvar.h>
#endif
struct cfdriver ykbec_cd = {