Use __FBSDID rather than rcsid[].

19 files changed, 59 insertions, 110 deletions

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 7817722..f4ab950 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -68,6 +68,9 @@
  * Driver for Altima AC101 10/100 PHY
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -87,11 +90,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int acphy_probe(device_t);
 static int acphy_attach(device_t);
 
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index cb5ea55..f3e0166 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -38,6 +36,9 @@
  * be an AM79c873 workalike.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -55,11 +56,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int amphy_probe(device_t);
 static int amphy_attach(device_t);
 
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index c90df66..1839ab7 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -37,6 +35,9 @@
  * 1000mbps; all we need to negotiate here is full or half duplex.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -56,11 +57,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int brgphy_probe(device_t);
 static int brgphy_attach(device_t);
 
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index e0fcca8..8b6656e 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -41,6 +39,9 @@
  * which is harder to do.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -71,11 +72,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #define DC_SETBIT(sc, reg, x)                           \
         CSR_WRITE_4(sc, reg,                            \
                 CSR_READ_4(sc, reg) | x)
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 5318499..d837b80 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -70,6 +70,9 @@
  * driver for 3Com internal PHYs
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -86,11 +89,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int exphy_probe(device_t);
 static int exphy_attach(device_t);
 
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 62f5691..f2bf5e0 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -72,6 +72,9 @@
  * datasheet from www.level1.com
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -91,11 +94,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int lxtphy_probe(device_t);
 static int lxtphy_attach(device_t);
 
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index b75b423..50aa0d9 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -43,6 +43,9 @@
  * plus some NetBSD extensions.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -60,11 +63,6 @@ MODULE_VERSION(miibus, 1);
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int miibus_readreg(device_t, int, int);
 static int miibus_writereg(device_t, int, int, int);
 static void miibus_statchg(device_t);
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 6a6c025..0b536e8 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -41,6 +41,9 @@
  * Subroutines common to all PHYs.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -58,11 +61,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Media to register setting conversion table.  Order matters.
  */
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 0aff7c9..01d11f8 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -35,8 +35,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -53,6 +51,9 @@
  * access to its internal RAM via indirect register access.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -72,11 +73,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int nsgphy_probe(device_t);
 static int nsgphy_attach(device_t);
 
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 53bb9f9..15de5b4 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -71,6 +71,9 @@
  * Data Sheet available from www.national.com
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -90,11 +93,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int nsphy_probe(device_t);
 static int nsphy_attach(device_t);
 
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index e2554b6..5f34f9c 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -42,6 +40,9 @@
  * to optimize the link.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -60,11 +61,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int pnaphy_probe(device_t);
 static int pnaphy_attach(device_t);
 
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 87c0732..e8022ed 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -39,6 +37,9 @@
  * NWAY to work right is amazingly difficult.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -67,11 +68,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #define DC_SETBIT(sc, reg, x)                           \
         CSR_WRITE_4(sc, reg,                            \
                 CSR_READ_4(sc, reg) | x)
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index c8b29fb..514dabd 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -72,6 +72,9 @@
  * datasheet from www.qualitysemi.com
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -91,11 +94,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int qsphy_probe(device_t);
 static int qsphy_attach(device_t);
 
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 3a74045..11abac1 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -28,14 +28,15 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
  * driver for RealTek 8139 internal PHYs
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -55,11 +56,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-   "$FreeBSD$";
-#endif
-
 static int rlphy_probe(device_t);
 static int rlphy_attach(device_t);
 
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 69b1f0c..8b45eef 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -24,8 +24,6 @@
  * 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$
  */
 
 /*
@@ -42,6 +40,9 @@
  * way.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -63,10 +64,12 @@
 
 #include "miibus_if.h"
 
+#if 0
 #if !defined(lint)
 static const char rcsid[] =
   "$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $";
 #endif
+#endif
 
 static int tdkphy_probe(device_t);
 static int tdkphy_attach(device_t);
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index af2cd23..9c35a55 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -70,6 +70,9 @@
  * Driver for Texas Instruments's ThunderLAN PHYs
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -92,11 +95,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 struct tlphy_softc {
 	struct mii_softc sc_mii;		/* generic PHY */
 	int sc_need_acomp;
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 6dff42e..12e5faf 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -70,6 +70,9 @@
  * driver for generic unknown PHYs
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -81,17 +84,11 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int ukphy_probe(device_t);
 static int ukphy_attach(device_t);
 
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index da14632..5e02430 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -41,6 +41,9 @@
  * Subroutines shared by the ukphy driver and other PHY drivers.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -55,11 +58,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Media status subroutine.  If a PHY driver does media detection simply
  * by decoding the NWay autonegotiation, use this routine.
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 2c6dbfa..669f175 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT 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$
  */
 
 /*
@@ -38,13 +36,15 @@
  * here is full/half duplex. Speed is always 1000mbps.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-
 #include <net/if.h>
 #include <net/if_media.h>
 
@@ -56,11 +56,6 @@
 
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int xmphy_probe(device_t);
 static int xmphy_attach(device_t);