summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>1999-07-25 23:49:38 +0000
committerJason Wright <jason@cvs.openbsd.org>1999-07-25 23:49:38 +0000
commitd000d80d216138b960cb0c3f6b3a274b9cb55350 (patch)
treeca53bf01c438a807904bd2e80f567a1fb68f80c6
parent22f7ffc8555204ff72d7ab512489346a825e8d93 (diff)
move around ioctl definitions
-rw-r--r--sys/arch/sparc/dev/fga.c5
-rw-r--r--sys/arch/sparc/dev/magma.c2
-rw-r--r--sys/arch/sparc/dev/scf.c4
-rw-r--r--sys/arch/sparc/include/bppioctl.h (renamed from sys/arch/sparc/dev/bppioctl.h)0
-rw-r--r--sys/arch/sparc/include/fgaio.h (renamed from sys/arch/sparc/dev/fgaio.h)2
-rw-r--r--sys/arch/sparc/include/scfio.h (renamed from sys/arch/sparc/dev/scfio.h)2
6 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c
index b6d88026ce5..e53b4a06d57 100644
--- a/sys/arch/sparc/dev/fga.c
+++ b/sys/arch/sparc/dev/fga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fga.c,v 1.1 1999/07/23 19:11:25 jason Exp $ */
+/* $OpenBSD: fga.c,v 1.2 1999/07/25 23:49:37 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -59,8 +59,7 @@
#include <sparc/dev/fgareg.h>
#include <sparc/dev/fgavar.h>
-#include <sparc/dev/fgaio.h>
-#include <sparc/dev/daadioreg.h>
+#include <machine/fgaio.h>
int fgamatch __P((struct device *, void *, void *));
void fgaattach __P((struct device *, struct device *, void *));
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index 58bb91018da..b83cf8a2d1a 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -64,7 +64,7 @@
#include <dev/ic/cd1400reg.h>
#include <dev/ic/cd1190reg.h>
-#include "bppioctl.h"
+#include <sparc/bppioctl.h>
#include "magmareg.h"
/*
diff --git a/sys/arch/sparc/dev/scf.c b/sys/arch/sparc/dev/scf.c
index c7fe981784b..677839fb145 100644
--- a/sys/arch/sparc/dev/scf.c
+++ b/sys/arch/sparc/dev/scf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scf.c,v 1.1 1999/07/23 19:11:26 jason Exp $ */
+/* $OpenBSD: scf.c,v 1.2 1999/07/25 23:49:37 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -54,7 +54,7 @@
#include <machine/autoconf.h>
#include <sparc/cpu.h>
#include <sparc/sparc/cpuvar.h>
-#include <sparc/dev/scfio.h>
+#include <machine/scfio.h>
#include <sparc/dev/scfreg.h>
int scfmatch __P((struct device *, void *, void *));
diff --git a/sys/arch/sparc/dev/bppioctl.h b/sys/arch/sparc/include/bppioctl.h
index 3b1e82703fe..3b1e82703fe 100644
--- a/sys/arch/sparc/dev/bppioctl.h
+++ b/sys/arch/sparc/include/bppioctl.h
diff --git a/sys/arch/sparc/dev/fgaio.h b/sys/arch/sparc/include/fgaio.h
index f139a29d450..246a8809630 100644
--- a/sys/arch/sparc/dev/fgaio.h
+++ b/sys/arch/sparc/include/fgaio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fgaio.h,v 1.1 1999/07/23 19:11:25 jason Exp $ */
+/* $OpenBSD: fgaio.h,v 1.1 1999/07/25 23:49:37 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
diff --git a/sys/arch/sparc/dev/scfio.h b/sys/arch/sparc/include/scfio.h
index 117c88986b0..ced4e54b42a 100644
--- a/sys/arch/sparc/dev/scfio.h
+++ b/sys/arch/sparc/include/scfio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scfio.h,v 1.1 1999/07/23 19:11:26 jason Exp $ */
+/* $OpenBSD: scfio.h,v 1.1 1999/07/25 23:49:37 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)