From 5923199859ae09d6e67fe6301e8fdf734d670560 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Wed, 11 Jun 2003 07:22:30 +0000
Subject: [PATCH] Use __FBSDID().

---
 sys/netatm/uni/q2110_sigaa.c         | 13 +++----------
 sys/netatm/uni/q2110_sigcpcs.c       | 13 +++----------
 sys/netatm/uni/q2110_subr.c          | 13 +++----------
 sys/netatm/uni/qsaal1_sigaa.c        | 13 +++----------
 sys/netatm/uni/qsaal1_sigcpcs.c      | 13 +++----------
 sys/netatm/uni/qsaal1_subr.c         | 13 +++----------
 sys/netatm/uni/sscf_uni.c            | 13 +++----------
 sys/netatm/uni/sscf_uni_lower.c      | 12 +++---------
 sys/netatm/uni/sscf_uni_upper.c      | 13 +++----------
 sys/netatm/uni/sscop.c               | 13 +++----------
 sys/netatm/uni/sscop_lower.c         | 13 +++----------
 sys/netatm/uni/sscop_pdu.c           | 12 +++---------
 sys/netatm/uni/sscop_sigaa.c         | 13 +++----------
 sys/netatm/uni/sscop_sigcpcs.c       | 13 +++----------
 sys/netatm/uni/sscop_subr.c          | 13 +++----------
 sys/netatm/uni/sscop_timer.c         | 13 +++----------
 sys/netatm/uni/sscop_upper.c         | 13 +++----------
 sys/netatm/uni/uni_load.c            | 12 +++---------
 sys/netatm/uni/uniarp.c              | 13 +++----------
 sys/netatm/uni/uniarp_cache.c        | 13 +++----------
 sys/netatm/uni/uniarp_input.c        | 13 +++----------
 sys/netatm/uni/uniarp_output.c       | 13 +++----------
 sys/netatm/uni/uniarp_timer.c        | 13 +++----------
 sys/netatm/uni/uniarp_vcm.c          | 12 +++---------
 sys/netatm/uni/uniip.c               | 13 +++----------
 sys/netatm/uni/unisig_decode.c       | 12 +++---------
 sys/netatm/uni/unisig_encode.c       | 13 +++----------
 sys/netatm/uni/unisig_if.c           | 13 +++----------
 sys/netatm/uni/unisig_mbuf.c         | 13 +++----------
 sys/netatm/uni/unisig_msg.c          | 13 +++----------
 sys/netatm/uni/unisig_print.c        | 13 +++----------
 sys/netatm/uni/unisig_proto.c        | 13 +++----------
 sys/netatm/uni/unisig_sigmgr_state.c | 13 +++----------
 sys/netatm/uni/unisig_subr.c         | 13 +++----------
 sys/netatm/uni/unisig_util.c         | 13 +++----------
 sys/netatm/uni/unisig_vc_state.c     | 13 +++----------
 36 files changed, 108 insertions(+), 355 deletions(-)

diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 4bab8006016f..6f01b99c2753 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.2110 - Process AA-signals (SAP_SSCOP)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -50,11 +48,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 35444adf5109..74d239b7ec83 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.2110 - Process CPCS-signals (SSCOP PDUs)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -57,11 +55,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 59fe47795b1f..5f0eece6e3f1 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.2110 - Subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -50,11 +48,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Conditionally Clear Transmission Queues
  * 
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 3fcb32d2d959..7d5e5cde0bdf 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.SAAL1 - Process AA-signals (SAP_SSCOP)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -50,11 +48,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 50ba1d70aa3d..4df194f7b6e6 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.SAAL1 - Process CPCS-signals (SSCOP PDUs)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -57,11 +55,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index b4c206ae5980..d82ae1d0bc7c 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * ITU-T Q.SAAL1 - Subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -50,11 +48,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Re-establish a new SSCOP Connection
  * 
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index b5ff7d0e1cf9..dc51e72efa44 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * Signalling AAL SSCF at the UNI
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,11 +59,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 79132ec9a2bd..08b83dcc45fa 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCF UNI - SSCF_UNI SAP interface processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,10 +59,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 extern uma_zone_t	unisig_vc_zone;
 
 /*
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index b33d0a8f6907..3f127e6e881e 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCF UNI - SSCOP SAP interface processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -58,11 +56,6 @@
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscf_uni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * SSCF_UNI Upper Stack Command Handler
  * 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 6374f30caf0d..5d0426b93f5f 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * Service Specific Connection Oriented Protocol (SSCOP)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -63,11 +61,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 8f9c75cd5947..086250b83096 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP - SSCOP SAP interface processing 
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -58,11 +56,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local variables
  */
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index e34f3c6ae417..e66606522090 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP - PDU subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -59,10 +57,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 33968ba42b42..528d1a229deb 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP Common - Process AA-signals (SAP_SSCOP)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -50,11 +48,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * SSCOP_ESTABLISH_REQ / SOS_IDLE Command Processor
  * 
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 1a27b6ce78ba..919ba41767fd 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP Common - Process CPCS-signals (SSCOP PDUs)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -57,11 +55,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * No-op Processor
  *
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 051b133ec189..c4d2f4c1d1a1 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP - Subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -59,11 +57,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index f0cc351f4234..da388d3d4520 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP - Timer processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -58,11 +56,6 @@
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 3f9ceece9903..4b22e9667757 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * SSCOP - CPCS SAP interface processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -59,11 +57,6 @@
 #include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 0caa8832768a..2f594d41f379 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * Loadable kernel module support
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #ifndef ATM_UNI_MODULE
 #include "opt_atm.h"
 #endif
@@ -60,10 +58,6 @@
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * External functions
  */
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 0de56b8df535..9a3ea78b90a6 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577)
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -68,11 +66,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index dbfe40241b94..3e28912cad37 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577) - ARP cache processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -64,11 +62,6 @@
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/uniip_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Add data to the arp table cache
  * 
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 7e15778d3d2a..2beda86e9d8b 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577) - Input packet processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -64,11 +62,6 @@
 #include <netatm/ipatm/ipatm_serv.h>
 #include <netatm/uni/uniip_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index e3cfeacd2feb..e2547e08056b 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577) - Output packet processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,11 +59,6 @@
 #include <netatm/ipatm/ipatm_serv.h>
 #include <netatm/uni/uniip_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Issue an ATMARP Request PDU
  * 
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index 830961562489..2f2915bf5f7f 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577) - Timer processing
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -58,11 +56,6 @@
 #include <netatm/ipatm/ipatm_serv.h>
 #include <netatm/uni/uniip_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index ac1c1675f7ba..0e09adbe2186 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI ATMARP support (RFC1577) - Virtual Channel Management
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -62,10 +60,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 extern uma_zone_t	unisig_vc_zone;
 
 /*
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 3635523df396..60f02b212640 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------
  *
  * UNI IP interface module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -54,11 +52,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index aa49fdaca7f9..676be2e21456 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Message formatting module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -62,10 +60,6 @@
 #include <netatm/uni/unisig_mbuf.h>
 #include <netatm/uni/unisig_decode.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 #define	ALLOC_IE(ie) do {						\
 	(ie) = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);		\
 	if ((ie) == NULL)						\
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 52f55cc980d3..932290628a06 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Message formatting module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -62,11 +60,6 @@
 #include <netatm/uni/unisig_mbuf.h>
 #include <netatm/uni/unisig_decode.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index f914cb6b901f..6005932bc2bb 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * System interface module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -70,11 +68,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index 5123eccc6d07..c2f5bbb9216c 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Message buffer handling routines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -60,11 +58,6 @@
 #include <netatm/uni/unisig_mbuf.h>
 #include <netatm/uni/unisig_msg.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Initialize a unisig formatting structure
  *
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index a193d008c2e9..94a1f6a0d555 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Message handling module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -63,11 +61,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index d3ad34281279..a6d7919e85a8 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Print Q.2931 messages
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -53,11 +51,6 @@
 #include <netatm/uni/unisig_msg.h>
 #include <netatm/uni/unisig_print.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local declarations
  */
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 65a9d04988bf..09cebd231473 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Protocol processing module.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -58,11 +56,6 @@
 
 #include <netatm/uni/unisig_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Process a UNISIG timeout
  *
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index 1d73cb51a91d..ad4a8d2051eb 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Signalling manager finite state machine
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,11 +59,6 @@
 #include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 31cd1a4fc2fd..dfcb0a860b16 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Subroutines
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -59,11 +57,6 @@
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * External variables
  */
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 41109a510130..815242b98837 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * Protocol processing module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -59,11 +57,6 @@
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Free a UNISIG signalling message
  *
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 3c88cba80101..50eb4743ecc0 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ----------------------------------------
  *
  * VC state machine
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -60,11 +58,6 @@
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Local functions
  */