From a9687d2721e9bc0f9f080b124e7312b0578adaf5 Mon Sep 17 00:00:00 2001
From: Bill Joy <root@ucbvax.Berkeley.EDU>
Date: Mon, 11 Oct 1982 00:58:43 -0800
Subject: [PATCH] move vax headers into vax directories

SCCS-vsn: sys/vax/if/if_acc.c 4.21
SCCS-vsn: sys/vax/if/if_css.c 4.3
SCCS-vsn: sys/vax/if/if_dmc.c 4.19
SCCS-vsn: sys/vax/if/if_ec.c 4.24
---
 usr/src/sys/vax/if/if_acc.c | 14 ++++++++------
 usr/src/sys/vax/if/if_css.c | 14 ++++++++------
 usr/src/sys/vax/if/if_dmc.c | 18 ++++++++++--------
 usr/src/sys/vax/if/if_ec.c  | 25 ++++++++++++++-----------
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c
index 7df524c18a..359921dbd3 100644
--- a/usr/src/sys/vax/if/if_acc.c
+++ b/usr/src/sys/vax/if/if_acc.c
@@ -1,4 +1,4 @@
-/*	if_acc.c	4.20	82/10/09	*/
+/*	if_acc.c	4.21	82/10/10	*/
 
 #include "acc.h"
 #ifdef NACC > 0
@@ -14,15 +14,17 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
 #include "../h/vmmac.h"
+
 #include "../net/if.h"
-#include "../vaxif/if_acc.h"
 #include "../netimp/if_imp.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_acc.h"
 #include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
 
 int     accprobe(), accattach(), accrint(), accxint();
 struct  uba_device *accinfo[NACC];
diff --git a/usr/src/sys/vax/if/if_css.c b/usr/src/sys/vax/if/if_css.c
index 5f32281573..517d0023f5 100644
--- a/usr/src/sys/vax/if/if_css.c
+++ b/usr/src/sys/vax/if/if_css.c
@@ -1,4 +1,4 @@
-/*      if_css.c     4.2     82/10/09     */
+/*      if_css.c     4.3     82/10/10     */
 
 #include "css.h"
 
@@ -34,15 +34,17 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
 #include "../h/vmmac.h"
-#include "../vaxif/if_css.h"
+
 #include "../net/if.h"
 #include "../netimp/if_imp.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_css.h"
 #include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
 
 int     cssprobe(), cssattach(), cssrint(), cssxint();
 struct  uba_device *cssinfo[NCSS];
diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c
index a2b5bf43db..1f71e394d5 100644
--- a/usr/src/sys/vax/if/if_dmc.c
+++ b/usr/src/sys/vax/if/if_dmc.c
@@ -1,4 +1,4 @@
-/*	if_dmc.c	4.18	82/10/09	*/
+/*	if_dmc.c	4.19	82/10/10	*/
 
 #include "dmc.h"
 #if NDMC > 0
@@ -19,18 +19,20 @@ int dmcdebug = 1;
 #include "../h/tty.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
 #include "../h/vmmac.h"
+#include <errno.h>
+
+#include "../net/if.h"
+#include "../net/route.h"
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
-#include "../net/if.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
 #include "../vaxif/if_uba.h"
 #include "../vaxif/if_dmc.h"
-#include "../net/route.h"
-#include <errno.h>
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
 
 /*
  * Driver information for auto-configuration stuff.
diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c
index 47f625a51f..e13e91f29c 100644
--- a/usr/src/sys/vax/if/if_ec.c
+++ b/usr/src/sys/vax/if/if_ec.c
@@ -1,4 +1,4 @@
-/*	if_ec.c	4.23	82/10/09	*/
+/*	if_ec.c	4.24	82/10/10	*/
 
 #include "ec.h"
 
@@ -13,22 +13,25 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/ecreg.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
 #include "../h/vmmac.h"
+#include <errno.h>
+
+#include "../net/if.h"
+#include "../net/netisr.h"
+#include "../net/route.h"
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
-#include "../net/if.h"
-#include "../vaxif/if_ec.h"
-#include "../vaxif/if_uba.h"
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netpup/pup.h"
-#include "../net/route.h"
-#include <errno.h>
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_ec.h"
+#include "../vaxif/if_ecreg.h"
+#include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
 
 #define	ECMTU	1500
 #define	ECMEM	0000000
-- 
2.20.1