summaryrefslogtreecommitdiffstats
path: root/sys/dev/joy
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-02-26 05:14:53 +0000
committerbde <bde@FreeBSD.org>1995-02-26 05:14:53 +0000
commit7c16fe40ea66e6edc77ed310b654360adf11b9f9 (patch)
tree889003876b12e18849f341dacdf94e6808f0ea7f /sys/dev/joy
parenta440c10bc1d680984d9a9a5f9a5780c13844da92 (diff)
downloadFreeBSD-src-7c16fe40ea66e6edc77ed310b654360adf11b9f9.zip
FreeBSD-src-7c16fe40ea66e6edc77ed310b654360adf11b9f9.tar.gz
Replace all remaining instances of `i386/include' by `machine' and fix
nearby #include inconsistencies.
Diffstat (limited to 'sys/dev/joy')
-rw-r--r--sys/dev/joy/joy.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 77ef121..5fae0d7 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -31,13 +31,15 @@
#if NJOY > 0
#include <errno.h>
+
#include <sys/types.h>
-#include <i386/isa/isa.h>
-#include <i386/isa/timerreg.h>
-#include <i386/isa/isa_device.h>
+
#include <machine/cpufunc.h>
+#include <machine/joystick.h>
-#include <i386/include/joystick.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/timerreg.h>
/* The game port can manage 4 buttons and 4 variable resistors (usually 2
* joysticks, each with 2 buttons and 2 pots.) via the port at address 0x201.
OpenPOWER on IntegriCloud