From 7c16fe40ea66e6edc77ed310b654360adf11b9f9 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 26 Feb 1995 05:14:53 +0000
Subject: Replace all remaining instances of `i386/include' by `machine' and
 fix nearby #include inconsistencies.

---
 sys/dev/joy/joy.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'sys/dev')

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.
-- 
cgit v1.1