Use __FBSDID rather than rcsid[].

102 files changed, 262 insertions, 529 deletions

diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index be1fcef..7bc4edf 100644
--- a/sys/boot/efi/libefi/copy.c
+++ b/sys/boot/efi/libefi/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 2a5b98b..723f681 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/sys/boot/efi/libefi/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c
index 254ef0d..c88462e 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/sys/boot/efi/libefi/efi_console.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index abfa6a8..563b533 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/module.c b/sys/boot/efi/libefi/module.c
index 6c07e28..7a3f4b2 100644
--- a/sys/boot/efi/libefi/module.c
+++ b/sys/boot/efi/libefi/module.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 27192de..3ca456e 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/loader/conf.c b/sys/boot/efi/loader/conf.c
index 0e5407c..145b16b 100644
--- a/sys/boot/efi/loader/conf.c
+++ b/sys/boot/efi/loader/conf.c
@@ -31,10 +31,8 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index bc1c044..58b9620 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
index be1fcef..7bc4edf 100644
--- a/sys/boot/ia64/common/copy.c
+++ b/sys/boot/ia64/common/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/efi/conf.c b/sys/boot/ia64/efi/conf.c
index 0e5407c..145b16b 100644
--- a/sys/boot/ia64/efi/conf.c
+++ b/sys/boot/ia64/efi/conf.c
@@ -31,10 +31,8 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index bc1c044..58b9620 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/libski/copy.c b/sys/boot/ia64/libski/copy.c
index d5c0623..d86537a 100644
--- a/sys/boot/ia64/libski/copy.c
+++ b/sys/boot/ia64/libski/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/libski/delay.c b/sys/boot/ia64/libski/delay.c
index b4e9dff..2389603 100644
--- a/sys/boot/ia64/libski/delay.c
+++ b/sys/boot/ia64/libski/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/libski/exit.c b/sys/boot/ia64/libski/exit.c
index 5648580..aeac67c 100644
--- a/sys/boot/ia64/libski/exit.c
+++ b/sys/boot/ia64/libski/exit.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/libski/module.c b/sys/boot/ia64/libski/module.c
index 596add7..0e77cfe 100644
--- a/sys/boot/ia64/libski/module.c
+++ b/sys/boot/ia64/libski/module.c
@@ -24,10 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/skiconsole.c b/sys/boot/ia64/libski/skiconsole.c
index 5038ce1..e5cea3d 100644
--- a/sys/boot/ia64/libski/skiconsole.c
+++ b/sys/boot/ia64/libski/skiconsole.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/time.c b/sys/boot/ia64/libski/time.c
index 7e49886..b682c2d 100644
--- a/sys/boot/ia64/libski/time.c
+++ b/sys/boot/ia64/libski/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
index 6db907c..3fe58f8 100644
--- a/sys/boot/ia64/ski/conf.c
+++ b/sys/boot/ia64/ski/conf.c
@@ -31,10 +31,9 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/copy.c b/sys/boot/ia64/ski/copy.c
index d5c0623..d86537a 100644
--- a/sys/boot/ia64/ski/copy.c
+++ b/sys/boot/ia64/ski/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/ski/delay.c b/sys/boot/ia64/ski/delay.c
index b4e9dff..2389603 100644
--- a/sys/boot/ia64/ski/delay.c
+++ b/sys/boot/ia64/ski/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/ski/exit.c b/sys/boot/ia64/ski/exit.c
index 5648580..aeac67c 100644
--- a/sys/boot/ia64/ski/exit.c
+++ b/sys/boot/ia64/ski/exit.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index cd3c479..c4b2225 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/skiconsole.c b/sys/boot/ia64/ski/skiconsole.c
index 5038ce1..e5cea3d 100644
--- a/sys/boot/ia64/ski/skiconsole.c
+++ b/sys/boot/ia64/ski/skiconsole.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/time.c b/sys/boot/ia64/ski/time.c
index 7e49886..b682c2d 100644
--- a/sys/boot/ia64/ski/time.c
+++ b/sys/boot/ia64/ski/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/skiload/conf.c b/sys/boot/ia64/skiload/conf.c
index 6db907c..3fe58f8 100644
--- a/sys/boot/ia64/skiload/conf.c
+++ b/sys/boot/ia64/skiload/conf.c
@@ -31,10 +31,9 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/skiload/main.c b/sys/boot/ia64/skiload/main.c
index cd3c479..c4b2225 100644
--- a/sys/boot/ia64/skiload/main.c
+++ b/sys/boot/ia64/skiload/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index cf1ff5d..f7e25a9 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 de05a84..3c23ac5 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 95a4c5b..d8c6391 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 466cf56..b3cbb4e 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 01d7203..4eafc68 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 e0fcca8..8b6656e 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 1fb594c..240bdba 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 87c0732..e8022ed 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 9efa94da..2020440 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 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);
 
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 9f7a930..9529996 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 d498ebb..e463c52 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 436dbc8..fbdb639 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 bacce60..388a22a 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 4406b54..32e13ab 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 3e1da15..2387c96 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 7c4d74d..dec498f 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 c1356c0..1434615 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 197d8be..ac25b47 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 767d6fa..7e3bfbe 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 ce25fe9..c13cbfa 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 ca7c482..f220190 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 4fe1ae0..9d96e0a 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 7293ab0..8412e18 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);
 
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 745deba..7a56dcc 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -22,9 +22,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -35,16 +32,15 @@
  *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <netatm/port.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * This file contains code that has been copied and/or modified from
  * the following FreeBSD files:
@@ -87,7 +83,6 @@ __RCSID("@(#) $FreeBSD$");
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
-/*static char *rcsid = "Id: xdr.c,v 1.2.4.2 1996/06/05 02:52:02 jkh Exp";*/
 #endif
 
 /*
@@ -408,7 +403,6 @@ xdr_opaque(xdrs, cp, cnt)
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";*/
-/*static char *rcsid = "Id: xdr_mem.c,v 1.2.4.2 1996/06/05 02:52:04 jkh Exp";*/
 #endif
 
 /*
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 1fb594c..240bdba 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/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/pci/if_pcn.c b/sys/pci/if_pcn.c
index 1a25adf..a97230a 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -29,18 +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$
  */
 
 /*
  * AMD Am79c972 fast ethernet PCI NIC driver. Datatheets are available
  * from http://www.amd.com.
  *
- * Written by Bill Paul <wpaul@osd.bsdi.com>
- */
-
-/*
  * The AMD PCnet/PCI controllers are more advanced and functional
  * versions of the venerable 7990 LANCE. The PCnet/PCI chips retain
  * backwards compatibility with the LANCE and thus can be made
@@ -55,6 +49,9 @@
  * layers without copying on both the x86 and alpha platforms).
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -95,11 +92,6 @@ MODULE_DEPEND(pcn, 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/pci/if_sf.c b/sys/pci/if_sf.c
index bacce60..388a22a 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/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/pci/if_sis.c b/sys/pci/if_sis.c
index f8f3a77..21d2c2e 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -57,6 +57,9 @@
  * longword aligned.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -98,11 +101,6 @@ MODULE_DEPEND(sis, 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/pci/if_sk.c b/sys/pci/if_sk.c
index 4406b54..32e13ab 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/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/pci/if_ste.c b/sys/pci/if_ste.c
index ecb26a0..4b93da0 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -28,10 +28,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$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -73,11 +74,6 @@
 
 MODULE_DEPEND(ste, miibus, 1, 1, 1);
 
-#if !defined(lint)
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/types and their names.
  */
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 3e1da15..2387c96 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/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/pci/if_tl.c b/sys/pci/if_tl.c
index 6c0c399..25b19f8 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.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$
  */
 
 /*
@@ -178,6 +176,9 @@
  * itself thereby reducing the load on the host CPU.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -223,11 +224,6 @@ MODULE_DEPEND(tl, 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.
  */
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index ca7c482..f220190 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/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/pci/if_wb.c b/sys/pci/if_wb.c
index c843db2..fe5ec34 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.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$
  */
 
 /*
@@ -83,6 +81,9 @@
  * three of my test boards seems fine.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_bdg.h"
 
 #include <sys/param.h>
@@ -126,11 +127,6 @@
 
 MODULE_DEPEND(wb, miibus, 1, 1, 1);
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 /*
  * Various supported device vendors/types and their names.
  */
diff --git a/sys/powerpc/aim/clock.c b/sys/powerpc/aim/clock.c
index b4f86e9..11ba5d0 100644
--- a/sys/powerpc/aim/clock.c
+++ b/sys/powerpc/aim/clock.c
@@ -55,10 +55,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 <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/aim/copyinout.c b/sys/powerpc/aim/copyinout.c
index 227dd70..f916351 100644
--- a/sys/powerpc/aim/copyinout.c
+++ b/sys/powerpc/aim/copyinout.c
@@ -53,10 +53,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 <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index e904fa3..39fcc49 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -54,10 +54,8 @@
  *	$NetBSD: machdep.c,v 1.74.2.1 2000/11/01 16:13:48 tv Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_compat.h"
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 3180768..0052881 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -90,10 +90,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-   "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Manages physical address maps.
diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c
index 11bc6de..0111098 100644
--- a/sys/powerpc/aim/ofw_machdep.c
+++ b/sys/powerpc/aim/ofw_machdep.c
@@ -31,10 +31,8 @@
  * $NetBSD: ofw_machdep.c,v 1.5 2000/05/23 13:25:43 tsubai Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 95dea63..22ec57a 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -31,10 +31,8 @@
  * $NetBSD: trap.c,v 1.58 2002/03/04 04:07:35 dbj Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index 3ec54e3..06787f7 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/bcopy.c b/sys/powerpc/powerpc/bcopy.c
index d5c83e5..c89b8c7 100644
--- a/sys/powerpc/powerpc/bcopy.c
+++ b/sys/powerpc/powerpc/bcopy.c
@@ -42,10 +42,8 @@ static char *sccsid = "from: @(#)bcopy.c      5.11 (Berkeley) 6/21/91";
 static char *rcsid = "$NetBSD: bcopy.c,v 1.2 1997/04/16 22:09:41 thorpej Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
-#ifndef lint
-static char *rcsid =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 63fdf71..7401e27 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -27,10 +27,8 @@
  *   From i386/busdma_machdep.c,v 1.26 2002/04/19 22:58:09 alfred
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MacPPC bus dma support routines
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index b4f86e9..11ba5d0 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -55,10 +55,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 <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c
index 227dd70..f916351 100644
--- a/sys/powerpc/powerpc/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -53,10 +53,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 <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copystr.c b/sys/powerpc/powerpc/copystr.c
index d7bedc2..1a159d8 100644
--- a/sys/powerpc/powerpc/copystr.c
+++ b/sys/powerpc/powerpc/copystr.c
@@ -31,10 +31,8 @@
  *	$NetBSD: copystr.c,v 1.3 2000/06/08 06:47:17 kleink Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c
index 48e893d..f24d866 100644
--- a/sys/powerpc/powerpc/extintr.c
+++ b/sys/powerpc/powerpc/extintr.c
@@ -39,10 +39,8 @@
  *	@(#)isa.c	7.2 (Berkeley) 5/12/91
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c
index 8c6e97b..d4c588a 100644
--- a/sys/powerpc/powerpc/fpu.c
+++ b/sys/powerpc/powerpc/fpu.c
@@ -31,10 +31,8 @@
  *	$NetBSD: fpu.c,v 1.5 2001/07/22 11:29:46 wiz Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/powerpc/powerpc/fuswintr.c b/sys/powerpc/powerpc/fuswintr.c
index 236b529..cb5abb7 100644
--- a/sys/powerpc/powerpc/fuswintr.c
+++ b/sys/powerpc/powerpc/fuswintr.c
@@ -31,10 +31,8 @@
  * $NetBSD: fuswintr.c,v 1.2 2000/06/08 07:29:54 kleink Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index e904fa3..39fcc49 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -54,10 +54,8 @@
  *	$NetBSD: machdep.c,v 1.74.2.1 2000/11/01 16:13:48 tv Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_compat.h"
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index 3180768..0052881 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -90,10 +90,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-   "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Manages physical address maps.
diff --git a/sys/powerpc/powerpc/ofw_machdep.c b/sys/powerpc/powerpc/ofw_machdep.c
index 11bc6de..0111098 100644
--- a/sys/powerpc/powerpc/ofw_machdep.c
+++ b/sys/powerpc/powerpc/ofw_machdep.c
@@ -31,10 +31,8 @@
  * $NetBSD: ofw_machdep.c,v 1.5 2000/05/23 13:25:43 tsubai Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 3180768..0052881 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -90,10 +90,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-   "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Manages physical address maps.
diff --git a/sys/powerpc/powerpc/suswintr.c b/sys/powerpc/powerpc/suswintr.c
index 4a0f5c1..949a0ad 100644
--- a/sys/powerpc/powerpc/suswintr.c
+++ b/sys/powerpc/powerpc/suswintr.c
@@ -31,10 +31,8 @@
  * $NetBSD: suswintr.c,v 1.2 2000/06/09 14:05:48 kleink Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c
index 12dd55c..4b8f814 100644
--- a/sys/powerpc/powerpc/syncicache.c
+++ b/sys/powerpc/powerpc/syncicache.c
@@ -31,10 +31,8 @@
  * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #if	defined(_KERNEL) || defined(_STANDALONE)
diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c
index e4183f2..a97e210 100644
--- a/sys/powerpc/powerpc/sys_machdep.c
+++ b/sys/powerpc/powerpc/sys_machdep.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 <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 95dea63..22ec57a 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -31,10 +31,8 @@
  * $NetBSD: trap.c,v 1.58 2002/03/04 04:07:35 dbj Exp $
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"