Move the softc into the machdep parts.

2 files changed, 6 insertions, 7 deletions

diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h
index 7ba91a81050..5f28e10b1e1 100644
--- a/sys/arch/sun3/include/z8530var.h
+++ b/sys/arch/sun3/include/z8530var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530var.h,v 1.7 1997/09/21 04:21:26 niklas Exp $	*/
+/*	$OpenBSD: z8530var.h,v 1.8 2001/08/18 22:37:40 art Exp $	*/
 /*	$NetBSD: z8530var.h,v 1.5 1996/10/13 03:47:44 christos Exp $	*/
 
 /*
@@ -47,6 +47,10 @@
  */
 
 #include <dev/ic/z8530sc.h>
+struct zsc_softc {
+        struct  device zsc_dev;         /* required first: base device */
+        struct  zs_chanstate zsc_cs[2]; /* channel A and B soft state */
+};
 
 /*
  * Functions to read and write individual registers in a channel.
diff --git a/sys/dev/ic/z8530sc.h b/sys/dev/ic/z8530sc.h
index 5781f03b802..e005e6e347b 100644
--- a/sys/dev/ic/z8530sc.h
+++ b/sys/dev/ic/z8530sc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530sc.h,v 1.7 1997/01/15 05:35:47 kstailey Exp $	*/
+/*	$OpenBSD: z8530sc.h,v 1.8 2001/08/18 22:37:40 art Exp $	*/
 /*	$NetBSD: z8530sc.h,v 1.4 1996/10/16 20:34:54 gwr Exp $	*/
 
 /*
@@ -106,11 +106,6 @@ struct zsops {
 
 extern struct zsops zsops_null;
 
-struct zsc_softc {
-	struct	device zsc_dev;		/* required first: base device */
-	struct	zs_chanstate zsc_cs[2];	/* channel A and B soft state */
-};
-
 struct zsc_attach_args {
 	int channel;	/* two serial channels per zsc */
 	int hwflags;