From b49ecb9108950eef22ee506e4960f32897cd0d64 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 15 Oct 1996 19:22:46 +0000
Subject: [PATCH] Updated #includes to 4.4lite style.

---
 sys/alpha/linux/linux.h    | 5 +++--
 sys/dev/cy/cy_pci.c        | 5 +++--
 sys/dev/de/if_de.c         | 4 ++--
 sys/dev/ed/if_ed_pci.c     | 4 ++--
 sys/gnu/isdn/isdn.c        | 7 +++----
 sys/i386/isa/aic6360.c     | 4 ++--
 sys/i386/isa/sound/local.h | 4 ++--
 sys/i386/isa/ultra14f.c    | 4 ++--
 sys/i386/linux/linux.h     | 5 +++--
 sys/pci/aic7870.c          | 4 ++--
 sys/pci/bt9xx.c            | 4 ++--
 sys/pci/cy_pci.c           | 5 +++--
 sys/pci/if_de.c            | 4 ++--
 sys/pci/if_ed_p.c          | 4 ++--
 sys/pci/meteor.c           | 2 +-
 sys/sys/vnode.h            | 4 ++--
 16 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index 8372f4a544f..20175eaa528 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.7 1996/03/10 08:42:47 sos Exp $
+ *	$Id: linux.h,v 1.8 1996/03/10 22:30:52 peter Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
 #define _I386_LINUX_LINUX_H_
-#include "i386/linux/linux_syscall.h"
+
+#include <i386/linux/linux_syscall.h>
 
 typedef unsigned short linux_uid_t;
 typedef unsigned short linux_gid_t;
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index d9bbd7222df..dec0ddd1469 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,15 +24,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cy_pci.c,v 1.1 1996/10/13 01:09:23 davidg Exp $
  */
 
 /*
  * Cyclades Y PCI serial interface driver
  */
 
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 5b5cb25a9ff..0b590aa3814 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.52 1996/09/20 04:35:15 davidg Exp $
+ * $Id: if_de.c,v 1.53 1996/10/10 19:44:10 wollman Exp $
  *
  */
 
@@ -83,7 +83,7 @@
 
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040.h>
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 05382d892a0..743b6a063eb 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.3 1996/06/14 11:02:07 asami Exp $
+ *	$Id: if_ed_p.c,v 1.4 1996/08/28 18:54:26 bde Exp $
  */
 
 #include "pci.h"
@@ -30,7 +30,7 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-#include <ed.h>
+#include "ed.h"
 
 #define PCI_DEVICE_ID_NE2000	0x802910ec
 
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 838e70bdbf0..b36a1a96aa3 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-/* @(#)$Id: isdn.c,v 1.12 1995/12/17 21:17:48 phk Exp $
+/* @(#)$Id: isdn.c,v 1.13 1996/06/12 05:02:21 gpalmer Exp $
  *******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -39,8 +39,7 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-#include "gnu/isdn/isdn_ioctl.h"
-
+#include <gnu/isdn/isdn_ioctl.h>
 
 isdn_appl_t     isdn_appl[N_ISDN_APPL];
 isdn_ctrl_t     isdn_ctrl[N_ISDN_CTRL];
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index d4dbb4a6b2f..d9de4a6836c 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.21 1996/05/02 10:43:08 phk Exp $
+ * $Id: aic6360.c,v 1.22 1996/09/06 23:07:07 phk Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -109,7 +109,7 @@
 #endif
 
 #include "opt_ddb.h"
-#include <aic.h>
+#include "aic.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index 4cf2b46f7b9..e80b780be8b 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -57,7 +57,7 @@
 # define GUSMAX_MIXER
 #endif
 
-#include <sb.h>
+#include "sb.h"
 #if NSB == 0 && !defined(EXCLUDE_SB)
 #define EXCLUDE_SB
 #endif
@@ -72,7 +72,7 @@
 #define EXCLUDE_SB16MIDI
 #endif
 
-#include <pas.h>
+#include "pas.h"
 #if NPAS == 0 && !defined(EXCLUDE_PAS)
 #define EXCLUDE_PAS
 #endif
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index 0ac82771dfc..8882f3996e6 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -22,13 +22,13 @@
  * today: Fri Jun  2 17:21:03 EST 1994
  * added 24F support  ++sg
  *
- *      $Id: ultra14f.c,v 1.47 1996/05/22 00:04:06 dima Exp $
+ *      $Id: ultra14f.c,v 1.48 1996/09/06 23:08:11 phk Exp $
  */
 
 #include <sys/types.h>
 
 #ifdef	KERNEL			/* don't laugh.. this compiles to a program too.. look */
-#include <uha.h>
+#include "uha.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 8372f4a544f..20175eaa528 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.7 1996/03/10 08:42:47 sos Exp $
+ *	$Id: linux.h,v 1.8 1996/03/10 22:30:52 peter Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
 #define _I386_LINUX_LINUX_H_
-#include "i386/linux/linux_syscall.h"
+
+#include <i386/linux/linux_syscall.h>
 
 typedef unsigned short linux_uid_t;
 typedef unsigned short linux_gid_t;
diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c
index 0705f320b20..6eef4597573 100644
--- a/sys/pci/aic7870.c
+++ b/sys/pci/aic7870.c
@@ -29,11 +29,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7870.c,v 1.37 1996/06/08 06:55:55 gibbs Exp $
+ *	$Id: aic7870.c,v 1.38 1996/10/06 16:38:45 gibbs Exp $
  */
 
 #if defined(__FreeBSD__)
-#include <pci.h>
+#include "pci.h"
 #endif
 #if NPCI > 0 || defined(__NetBSD__)
 #include <sys/param.h>
diff --git a/sys/pci/bt9xx.c b/sys/pci/bt9xx.c
index a9d22293fde..e259b3f5e59 100644
--- a/sys/pci/bt9xx.c
+++ b/sys/pci/bt9xx.c
@@ -19,10 +19,10 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: bt9xx.c,v 1.6 1996/02/16 17:24:19 gibbs Exp $
+ *	$Id: bt9xx.c,v 1.7 1996/02/18 07:44:16 gibbs Exp $
  */
 
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index d9bbd7222df..dec0ddd1469 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,15 +24,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cy_pci.c,v 1.1 1996/10/13 01:09:23 davidg Exp $
  */
 
 /*
  * Cyclades Y PCI serial interface driver
  */
 
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 5b5cb25a9ff..0b590aa3814 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.52 1996/09/20 04:35:15 davidg Exp $
+ * $Id: if_de.c,v 1.53 1996/10/10 19:44:10 wollman Exp $
  *
  */
 
@@ -83,7 +83,7 @@
 
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040.h>
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index 05382d892a0..743b6a063eb 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.3 1996/06/14 11:02:07 asami Exp $
+ *	$Id: if_ed_p.c,v 1.4 1996/08/28 18:54:26 bde Exp $
  */
 
 #include "pci.h"
@@ -30,7 +30,7 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-#include <ed.h>
+#include "ed.h"
 
 #define PCI_DEVICE_ID_NE2000	0x802910ec
 
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index a03963b7c2d..17b34eaeba5 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -174,7 +174,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include <pci.h>
+#include "pci.h"
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index c468ecfe2cc..fc03e73ed96 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.33 1996/05/31 00:20:32 peter Exp $
+ * $Id: vnode.h,v 1.34 1996/08/21 21:56:01 dyson Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -376,7 +376,7 @@ struct vop_generic_args {
 /*
  * Finally, include the default set of vnode operations.
  */
-#include <vnode_if.h>
+#include "vnode_if.h"
 
 /*
  * Public vnode manipulation functions.
-- 
2.45.2