22 files changed, 102 insertions, 102 deletions
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 977ed9b..17427e9 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $
+ *	@(#) $Id: eni.c,v 1.2 1998/09/17 09:34:58 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef	lint
-static char *RCSid = "@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef	lint
+__RCSID("@(#) $Id: eni.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
 /*
  * Typedef local functions
  */
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 35d1b13..71d2eb9 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $
+ *	@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
 static int	eni_test_memory __P((Eni_unit *));
 
 /*
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index a2a51fa..71253e2 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $
+ *	@(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
 /*
  * Device unit table
  */
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 41ffd48..d2c9ad6 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $
+ *	@(#) $Id: eni_if.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,10 +35,6 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
 #include <dev/hea/eni_suni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_if.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
 static void	eni_get_stats __P((Eni_unit *));
 
 /*
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index d8106ab..5706c65 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $
+ *	@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
 /*
  * Initialize adapter for PDU processing
  *
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index 44a6790..ccc0d6b 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $
  *
  */
 
@@ -35,10 +35,6 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
 #include <dev/hea/eni_suni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
 static void	eni_suni_intr __P((Eni_unit *));
 
 /*
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 94ce8c4..8e8be36 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
 static void	eni_recv_stack __P((void *, KBuffer *));
 
 #ifdef	DIAGNOSTIC
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 8e9f977..2721709 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $
  *
  */
 
@@ -36,16 +36,16 @@
  */
 
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_transmit.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $");
+#endif
+
 /*
  * Make a variable which controls printing of PDUs
  * as they travel through the driver.
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index 36c2a3d..a88fc01 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $
+ *	@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $
  *
  */
 
@@ -36,16 +36,16 @@
  */
 
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+#endif
+
 
 /*
  * VCC Stack Instantiation
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index d8bdce4..6952f01 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $
+ *	@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $";
+__RCSID("@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Local functions
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 980be43..c2ed628 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ *	@(#) $Id: fore_command.c,v 1.2 1998/09/17 09:34:58 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $";
+__RCSID("@(#) $Id: fore_command.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 /*
  * Local variables
  */
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 4abc5fa..5dc803a 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $
+ *	@(#) $Id: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $";
+__RCSID("@(#) $Id: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Supported device models
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 7d3b3b6..9c8a82d 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $
+ *	@(#) $Id: fore_if.c,v 1.1 1998/09/15 08:22:55 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $";
+__RCSID("@(#) $Id: fore_if.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Handle netatm core service interface ioctl requests 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index d82a8f8..eade984 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $Id: fore_init.c,v 1.2 1998/09/17 09:34:59 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_init.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Local functions
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index f295b62..6fba5f2 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $
+ *	@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $";
+__RCSID("@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 #if defined(sun)
 /*
  * Polling interrupt routine
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 251443d..1d5735d 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $Id: fore_load.c,v 1.2 1998/09/17 09:34:59 phk Exp $
  *
  */
 
@@ -35,21 +35,21 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_load.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Local functions
  */
 static int	fore_start __P((void));
+#ifdef sun
 static int	fore_stop __P((void));
 static int	fore_doload __P((void));
 static int	fore_dounload __P((void));
-#ifdef sun
 static int	fore_identify __P((char *));
 static int	fore_attach __P((struct devinfo *));
 #endif
@@ -156,6 +156,8 @@ fore_start()
 }
 
 
+#ifdef sun
+
 /*
  * Halt driver processing 
  * 
@@ -240,8 +242,6 @@ fore_stop()
 	return (0);
 }
 
-
-#ifdef sun
 /*
  * Device identify routine
  * 
@@ -1143,8 +1143,8 @@ fore_unattach(fup)
 	struct dev_info		*devinfo_p = fup->fu_devinfo;
 	struct dev_reg		*dev_reg_p;
 	struct dev_intr		*dev_intr_p;
-#endif
 	int			i;
+#endif
 
 
 	/*
@@ -1359,6 +1359,7 @@ fore_reset(fup)
  *******************************************************************
  */
 
+#ifdef sun
 /*
  * Generic module load processing
  * 
@@ -1418,7 +1419,6 @@ fore_dounload()
 }
 
 
-#ifdef sun
 /*
  * Loadable driver description
  */
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 59c82c9..d92d5a0 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $
+ *	@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $";
+__RCSID("@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Local functions
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 12dfcec..431a03f 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Local functions
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index c70b098..c1a1fab 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Get device statistics from CP
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index e0d0c0e..15cb02e 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $
+ *	@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $";
+__RCSID("@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Process a Fore timer tick
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 744e775..bced06c 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $
+ *	@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $";
+__RCSID("@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * Allocate Transmit Queue Data Structures
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 2481d17..325883b 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ *	@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <dev/hfa/fore_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $";
+__RCSID("@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
 #endif
 
-#include <dev/hfa/fore_include.h>
-
 
 /*
  * VCC Stack Instantiation