42 files changed, 130 insertions, 259 deletions

diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index cf1ff5d832ee..f7e25a97e29c 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.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$
  */
 
 /*
@@ -81,6 +79,9 @@
  * driver handles all of the encapsulation/decapsulation itself.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
 
 #ifdef INET
@@ -132,11 +133,6 @@
 #include <dev/an/if_aironet_ieee.h>
 #include <dev/an/if_anreg.h>
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /* These are global because we need them in sys/pci/if_an_p.c. */
 static void an_reset		(struct an_softc *);
 static int an_init_mpi350_desc	(struct an_softc *);
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index de05a8470079..3c23ac56f931 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.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$
  */
 
 /*
@@ -40,7 +38,11 @@
  * Columbia University, New York City
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
+
 #ifdef INET
 #define ANCACHE
 #endif
@@ -71,11 +73,6 @@
 #include <dev/an/if_aironet_ieee.h>
 #include <dev/an/if_anreg.h>
 
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif
-
 static struct isa_pnp_id an_ids[] = {
 	{ 0x0100ec06, "Aironet ISA4500/ISA4800" },
 	{ 0, NULL }
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 95a4c5b71bcb..d8c63918661c 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.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$
  */
 
 /*
@@ -40,6 +38,9 @@
  * Columbia University, New York City
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
 
 #ifdef INET
@@ -70,11 +71,6 @@
 #include <dev/pccard/pccarddevs.h>
 #include "card_if.h"
 
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif
-
 #include <dev/an/if_aironet_ieee.h>
 #include <dev/an/if_anreg.h>
 
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 466cf56e22ec..b3cbb4e16912 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.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$
  */
 
 /*
@@ -52,6 +50,9 @@
  * to go through their sales office to get it. Bleh.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
 
 #ifdef INET
@@ -82,11 +83,6 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif
-
 #include <dev/an/if_aironet_ieee.h>
 #include <dev/an/if_anreg.h>
 
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 01d720370479..4eafc685213f 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -29,18 +29,11 @@
  * 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$
  */
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
- * 
- * Written by Bill Paul <wpaul@windriver.com>
- * Senior Engineer, Wind River Systems
- */
-
-/*
+ *
  * The Broadcom BCM5700 is based on technology originally developed by
  * Alteon Networks as part of the Tigon I and Tigon II gigabit ethernet
  * MAC chips. The BCM5700, sometimes refered to as the Tigon III, has
@@ -70,6 +63,9 @@
  * ring.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -120,11 +116,6 @@ MODULE_DEPEND(bge, miibus, 1, 1, 1);
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/types and their names. Note: the
  * spec seems to indicate that the hardware still has Alteon's vendor
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index e0fcca88938a..8b6656e9977e 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/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/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 1fb594c0caa9..240bdba6b4ec 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.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$
  */
 
 /*
@@ -89,6 +87,9 @@
  * AX88140A doesn't support internal NWAY.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -135,11 +136,6 @@ MODULE_DEPEND(dc, miibus, 1, 1, 1);
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/types and their names.
  */
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 87c07323cb2e..e8022edb2d7a 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/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/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 9efa94da6485..202044030715 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -29,19 +29,12 @@
  * 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$
  */
 
 /*
  * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public
  * documentation not available, but ask me nicely.
  *
- * Written by Bill Paul <william.paul@windriver.com>
- * Wind River Systems
- */
-
-/*
  * The Level 1 chip is used on some D-Link, SMC and Addtron NICs.
  * It's a 64-bit PCI part that supports TCP/IP checksum offload,
  * VLAN tagging/insertion, GMII and TBI (1000baseX) ports. There
@@ -73,6 +66,9 @@
  *   if in fact he did me much of a favor)
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -112,11 +108,6 @@
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/types and their names.
  */
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 7817722cfceb..f4ab950b0942 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 cb5ea5503a69..f3e016652d10 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 c90df66f2cc9..1839ab74ad2d 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 e0fcca88938a..8b6656e9977e 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 53184991cdd1..d837b809a3ae 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 62f5691cc456..f2bf5e0e76cc 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 b75b423e4d59..50aa0d98b0be 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 6a6c0250d3f2..0b536e8da2a9 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 0aff7c99ddfd..01d11f8e130d 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 53bb9f9b13ee..15de5b4d1670 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 e2554b604818..5f34f9c09e71 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 87c07323cb2e..e8022edb2d7a 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 c8b29fbb4fb2..514dabdadc5b 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 3a7404557410..11abac18a563 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 69b1f0cd2fc6..8b45eefa0471 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 af2cd23cb552..9c35a5578ee6 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 6dff42e5267a..12e5faf0e818 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 da14632c84b1..5e024305396f 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 2c6dbfa54835..669f17579511 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);
 
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 9f7a930186c7..9529996381a8 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -25,10 +25,12 @@
  *
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
- * $FreeBSD$
- *
  * Myson fast ethernet PCI NIC driver
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index d498ebb07ba2..e463c52d0478 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.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$
  */
 
 /*
@@ -87,6 +85,9 @@
  * if the user selects an MTU larger than 8152 (8170 - 18).
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -130,11 +131,6 @@ MODULE_DEPEND(nge, miibus, 1, 1, 1);
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #define NGE_CSUM_FEATURES	(CSUM_IP | CSUM_TCP | CSUM_UDP)
 
 /*
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 436dbc8d7fe6..fbdb639e1524 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -23,10 +23,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_comconsole.h"
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index bacce60f7cdb..388a22abfb34 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.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$
  */
 
 /*
@@ -79,6 +77,9 @@
  * registers inside the 256-byte I/O window.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -119,11 +120,6 @@
 
 MODULE_DEPEND(sf, miibus, 1, 1, 1);
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static struct sf_type sf_devs[] = {
 	{ AD_VENDORID, AD_DEVICEID_STARFIRE,
 		"Adaptec AIC-6915 10/100BaseTX" },
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 4406b54ec57f..32e13ab409e5 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.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$
  */
 
 /*
@@ -68,6 +66,9 @@
  * both XMACs to operate as independent interfaces.
  */
  
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 3e1da1562cff..2387c96926ee 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.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$
  */
 
 /*
@@ -78,6 +76,9 @@
  * - Andrew Gallatin for providing FreeBSD/Alpha support.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ti.h"
 
 #include <sys/param.h>
@@ -150,11 +151,6 @@
 #error "options TI_JUMBO_HDRSPLIT and TI_PRIVATE_JUMBOS are mutually exclusive"
 #endif /* TI_JUMBO_HDRSPLIT && TI_JUMBO_HDRSPLIT */
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 struct ti_softc *tis[8];
 
 typedef enum {
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 7c4d74d25ec3..dec498f58244 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2001
@@ -39,6 +38,9 @@
  * Driver for 3c990 (Typhoon) Ethernet ASIC
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index c1356c04fa7e..14346154d06b 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.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$
  */
 
 /*
@@ -61,6 +59,9 @@
  * done using usbd_transfer() and friends.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -97,11 +98,6 @@ MODULE_DEPEND(if_aue, usb, 1, 1, 1);
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/products.
  */
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 197d8bebcd5b..ac25b4776c79 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.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$
  */
 
 /*
@@ -50,6 +48,9 @@
  * transaction, which helps performance a great deal.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -76,11 +77,6 @@
 
 #include <dev/usb/if_cuereg.h>
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/products.
  */
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 767d6fab845f..7e3bfbebd547 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.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$
  */
 
 /*
@@ -64,6 +62,9 @@
  * the development of this driver.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -92,11 +93,6 @@
 #include <dev/usb/if_kuereg.h>
 #include <dev/usb/kue_fw.h>
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 MODULE_DEPEND(if_kue, usb, 1, 1, 1);
 
 /*
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index ce25fe97c2bd..c13cbfa832bb 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.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$
  */
 
 /*
@@ -50,6 +48,9 @@
  * properly.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -67,11 +68,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usb_ethersubr.h>
 
-#ifndef lint
-Static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 Static struct ifqueue usbq_rx;
 Static struct ifqueue usbq_tx;
 Static int mtx_inited = 0;
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index ca7c482fcf2d..f220190e07d2 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.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$
  */
 
 /*
@@ -59,6 +57,9 @@
  * transmission.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -99,11 +100,6 @@ MODULE_DEPEND(vr, miibus, 1, 1, 1);
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #undef VR_USESWSHIFT
 
 /*
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 4fe1ae0279a5..9d96e0aff229 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -61,6 +61,9 @@
  * Prism 2 chipsets with firmware from Intersil and Symbol.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
 
@@ -111,11 +114,6 @@
 #define	IFQ_POLL(ifq, m)	IF_POLL((ifq), (m))
 #define IFQ_DEQUEUE(ifq, m)	IF_DEQUEUE((ifq), (m))
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static void wi_start(struct ifnet *);
 static int  wi_reset(struct wi_softc *);
 static void wi_watchdog(struct ifnet *);
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 7293ab0fafeb..8412e18225c8 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -38,6 +38,9 @@
  * Columbia University, New York City
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_wi.h"
 
 #include <sys/param.h>
@@ -73,11 +76,6 @@
 
 #include "card_if.h"
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 static int wi_pccard_probe(device_t);
 static int wi_pccard_attach(device_t);