Use __FBSDID().

Also some minor style cleanups.

24 files changed, 72 insertions, 5 deletions

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index f4ab950..47105ff 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -34,6 +34,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
  
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index f3e0166..e63d050 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for AMD AM79c873 PHYs
  * This driver also works for the Davicom DM9101 PHY, which appears to
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 5fa82da..988793e 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -35,6 +35,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
@@ -65,7 +68,6 @@
  *
  *	from: NetBSD: bmtphy.c,v 1.8 2002/07/03 06:25:50 simonb Exp
  *
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index fa19b75..12cf073 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
  * 1000mbps; all we need to negotiate here is full or half duplex.
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 8291000..4c930e5 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Pseudo-driver for internal NWAY support on DEC 21143 and workalike
  * controllers. Technically we're abusing the miibus code to handle
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 5a0d694..1975986 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -1,5 +1,7 @@
-/* $FreeBSD$ */
 /*
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
  * Principal Author: Parag Patel
  * Copyright (c) 2001
  * All rights reserved.
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index d837b80..97c97cd 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 54cab48..3aa6f16 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for Intel 82553 and 82555 PHYs
  */
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 4aa98af..57fbe16 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -37,6 +37,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
  
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 50aa0d9..4771cc5 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * MII bus layer, glues MII-capable network interface drivers to sharable
  * PHY drivers.  This exports an interface compatible with BSD/OS 3.0's,
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index f90a486..96e481c 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Subroutines common to all PHYs.
  */
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index f158a97..744d3c3 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -29,9 +29,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for Micro Linear 6692 PHYs
  *
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 81d7cee..0cd6133 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -37,6 +37,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Driver for the National Semiconductor DP83891 and DP83861
  * 10/100/1000 PHYs.
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 15de5b4..85a1d8f 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 5f34f9c..f952574 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -31,6 +31,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for homePNA PHYs
  * This is really just a stub that allows us to identify homePNA-based
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index ad9ad4f..4cfed03 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Pseudo-driver for media selection on the Lite-On PNIC 82c168
  * chip. The NWAY support on this chip is horribly broken, so we
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 514dabd..2c2bd6a 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,7 @@
 /*	OpenBSD: qsphy.c,v 1.6 2000/08/26 20:04:18 nate Exp */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 /*	NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp 	*/
 
 /*-
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 11abac1..d687992 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for RealTek 8139 internal PHYs
  */
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index 5e876af..f2dbc16 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.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$");
+
 /*
  * driver for RealTek RTL8150 internal PHY
  */
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 8b45eef..b21311f 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -26,6 +26,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Driver for the TDK 78Q2120 MII
  *
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 9c35a55..ca9f854 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 12e5faf..68403ee 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 5e02430..ca26b95 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Subroutines shared by the ukphy driver and other PHY drivers.
  */
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 669f175..2a1ee80 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * driver for the XaQti XMAC II's internal PHY. This is sort of
  * like a 10/100 PHY, except the only thing we're really autoselecting