Use __FBSDID rather than rcsid[].

10 files changed, 30 insertions, 67 deletions

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.
  */