Use __FBSDID().

Also some minor style cleanups.

10 files changed, 37 insertions, 50 deletions

diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 75bb00fc1147..d03f315be6ed 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index b8e98153d19b..1f68f7d3e44c 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index f56102ae98c1..fffdf654632e 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #ifdef COMPILING_LINT 
 #warning "The fore pci driver is broken and is not compiled with LINT"
 #else 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index fb2095ef1f10..f642111cde84 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index a160dbe7bf3c..915879342122 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -1,10 +1,8 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 0828d5c85033..51745ac9336f 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index f5b78c8a42c0..4aff05ff6378 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -1,10 +1,8 @@
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -22,11 +20,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
diff --git a/sys/dev/hfa/hfa_eisa.c b/sys/dev/hfa/hfa_eisa.c
index 6165334907d0..6c42fb8634e3 100644
--- a/sys/dev/hfa/hfa_eisa.c
+++ b/sys/dev/hfa/hfa_eisa.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  *
  * ===================================
diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c
index f5f448fe82bb..b6cc311ebd65 100644
--- a/sys/dev/hfa/hfa_pci.c
+++ b/sys/dev/hfa/hfa_pci.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  *
  * ===================================
diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index 3e769d2215ae..990803cb19d7 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -22,17 +22,12 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
-
-/*
- *
+/*-
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
  *
- *
  * This Host ATM Research Platform ("HARP") file (the "Software") is
  * made available by Network Computing Services, Inc. ("NetworkCS")
  * "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -50,9 +45,11 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>