Remove duplicate FBSDID's, move others to their right place.

22 files changed, 48 insertions, 78 deletions

diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 0b8328c..123135c 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -66,9 +66,6 @@ __FBSDID("$FreeBSD$");
  * ring.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index c3575a9..dc1c1b3 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
  * series chips and several workalikes including the following:
@@ -60,7 +63,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The Intel 21143 is the successor to the DEC 21140. It is basically
  * the same as the 21140 but with a few new features. The 21143 supports
@@ -89,9 +91,6 @@
  * AX88140A doesn't support internal NWAY.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8863e9d..063e7bb 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -23,10 +23,11 @@
  * 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$");
+
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
  *   adapters. By David Greenman, 29-April-1993
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 91b0eff..df84d49 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -69,9 +69,6 @@ __FBSDID("$FreeBSD$");
  *   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>
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index e555ba0..1e7e9c3 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -26,7 +26,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.
- *
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 92aed75..f01e8a9 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -88,9 +88,6 @@ __FBSDID("$FreeBSD$");
  * 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>
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index cb6331b..c72d43b 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
  *
@@ -105,9 +108,6 @@
  * driver is 7500 bytes.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index ede1a49..e1def22 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
  * Programming manual is available from:
@@ -39,7 +42,6 @@
  * Department of Electical Engineering
  * Columbia University, New York City
  */
-
 /*
  * The Adaptec AIC-6915 "Starfire" is a 64-bit 10/100 PCI ethernet
  * controller designed with flexibility and reducing CPU load in mind.
@@ -77,9 +79,6 @@
  * 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>
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 1b0c41a..1ef4493 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -31,7 +31,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /*
  * Copyright (c) 2003 Nathan L. Binkert <binkertn@umich.edu>
  *
@@ -48,6 +47,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
  * the SK-984x series adapters, both single port and dual port.
@@ -66,7 +68,6 @@
  * Department of Electrical Engineering
  * Columbia University, New York City
  */
-
 /*
  * The SysKonnect gigabit ethernet adapters consist of two main
  * components: the SysKonnect GEnesis controller chip and the XaQti Corp.
@@ -84,9 +85,6 @@
  * 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/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 1768b6d..689ee83 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -27,7 +27,6 @@
  * THEORY OF LIABILITY, WHETHER IN 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.
- *
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index dc9c908..fa4fc9d 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -22,7 +22,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.
- *
  */
 
 #include <sys/cdefs.h>
@@ -40,9 +39,6 @@ __FBSDID("$FreeBSD$");
  * Thanks are going to Steve Bauer and Jason Wright.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index a65f521..712bbea 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * VIA Rhine fast ethernet PCI NIC driver
  *
@@ -41,7 +44,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The VIA Rhine controllers are similar in some respects to the
  * the DEC tulip chips, except less complicated. The controller
@@ -57,9 +59,6 @@
  * transmission.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index c3575a9..dc1c1b3 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
  * series chips and several workalikes including the following:
@@ -60,7 +63,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The Intel 21143 is the successor to the DEC 21140. It is basically
  * the same as the 21140 but with a few new features. The 21143 supports
@@ -89,9 +91,6 @@
  * AX88140A doesn't support internal NWAY.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index c5bd726..914b54b 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -31,6 +31,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * AMD Am79c972 fast ethernet PCI NIC driver. Datatheets are available
  * from http://www.amd.com.
@@ -49,9 +52,6 @@
  * 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>
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index f7b6db4..9e25e2f 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * RealTek 8129/8139 PCI NIC driver
  *
@@ -41,7 +44,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The RealTek 8139 PCI NIC redefines the meaning of 'low end.' This is
  * probably the worst PCI ethernet controller ever made, with the possible
@@ -81,9 +83,6 @@
  * to select which interface to use depending on the chip type.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index ede1a49..e1def22 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
  * Programming manual is available from:
@@ -39,7 +42,6 @@
  * Department of Electical Engineering
  * Columbia University, New York City
  */
-
 /*
  * The Adaptec AIC-6915 "Starfire" is a 64-bit 10/100 PCI ethernet
  * controller designed with flexibility and reducing CPU load in mind.
@@ -77,9 +79,6 @@
  * 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>
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 99a8e42..fec9a41 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
  * available from http://www.sis.com.tw.
@@ -41,7 +44,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The SiS 900 is a fairly simple chip. It uses bus master DMA with
  * simple TX and RX descriptors of 3 longwords in size. The receiver
@@ -55,9 +57,6 @@
  * longword aligned.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 1b0c41a..1ef4493 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -31,7 +31,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /*
  * Copyright (c) 2003 Nathan L. Binkert <binkertn@umich.edu>
  *
@@ -48,6 +47,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
  * the SK-984x series adapters, both single port and dual port.
@@ -66,7 +68,6 @@
  * Department of Electrical Engineering
  * Columbia University, New York City
  */
-
 /*
  * The SysKonnect gigabit ethernet adapters consist of two main
  * components: the SysKonnect GEnesis controller chip and the XaQti Corp.
@@ -84,9 +85,6 @@
  * 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_tl.c b/sys/pci/if_tl.c
index 438215c..df7784f 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Texas Instruments ThunderLAN driver for FreeBSD 2.2.6 and 3.x.
  * Supports many Compaq PCI NICs based on the ThunderLAN ethernet controller,
@@ -47,7 +50,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * Some notes about the ThunderLAN:
  *
@@ -118,7 +120,6 @@
  * TX 'end of frame' interrupt. It will also generate an 'end of channel'
  * interrupt when it reaches the end of the list.
  */
-
 /*
  * Some notes about this driver:
  *
@@ -176,9 +177,6 @@
  * 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>
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index a65f521..712bbea 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * VIA Rhine fast ethernet PCI NIC driver
  *
@@ -41,7 +44,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The VIA Rhine controllers are similar in some respects to the
  * the DEC tulip chips, except less complicated. The controller
@@ -57,9 +59,6 @@
  * transmission.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index d1e36e1..13b29b0 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Winbond fast ethernet PCI NIC driver
  *
@@ -41,7 +44,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The Winbond W89C840F chip is a bus master; in some ways it resembles
  * a DEC 'tulip' chip, only not as complicated. Unfortunately, it has
@@ -81,9 +83,6 @@
  * three of my test boards seems fine.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "opt_bdg.h"
 
 #include <sys/param.h>
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index ed5e3c4..ae078ff 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -30,6 +30,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * 3Com 3c90x Etherlink XL PCI NIC driver
  *
@@ -71,7 +74,6 @@
  * Electrical Engineering Department
  * Columbia University, New York City
  */
-
 /*
  * The 3c90x series chips use a bus-master DMA interface for transfering
  * packets to and from the controller chip. Some of the "vortex" cards
@@ -99,9 +101,6 @@
  * PCI-based NICs.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>