diff options
author | marius <marius@FreeBSD.org> | 2004-05-29 18:09:10 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2004-05-29 18:09:10 +0000 |
commit | 41c5d57ced7f4797e42cfa47abbb8dfb2a9bd528 (patch) | |
tree | 9c46067a63cd2a0ecae4cac3f88af6395c948f96 | |
parent | 5a4326ce81f06763f8cd7408130adb2913f0675c (diff) | |
download | FreeBSD-src-41c5d57ced7f4797e42cfa47abbb8dfb2a9bd528.zip FreeBSD-src-41c5d57ced7f4797e42cfa47abbb8dfb2a9bd528.tar.gz |
Remove double __FBSDID and move the remaining one into a common place after
the license(s) and before the driver comment (the latter only in drivers not
having __FBSDID at that location).
-rw-r--r-- | sys/dev/dc/dcphy.c | 3 | ||||
-rw-r--r-- | sys/dev/dc/pnphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/acphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/amphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/bmtphy.c | 6 | ||||
-rw-r--r-- | sys/dev/mii/brgphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/dcphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/exphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/lxtphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/mii.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/mii_physubr.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/nsgphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/nsphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/pnaphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/pnphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/qsphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/rgephy.c | 6 | ||||
-rw-r--r-- | sys/dev/mii/rlphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/tdkphy.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/tlphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/ukphy.c | 9 | ||||
-rw-r--r-- | sys/dev/mii/ukphy_subr.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/xmphy.c | 3 |
23 files changed, 27 insertions, 90 deletions
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index 5b4b8f5..8bc1dc8 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -42,9 +42,6 @@ __FBSDID("$FreeBSD$"); * which is harder to do. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index 4cfed03..63891f5 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); * 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> diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 47105ff..78aa556 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -35,9 +35,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -67,13 +64,13 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * 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> diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index e63d050..c23cd3c 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD$"); * be an AM79c873 workalike. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index df5bdc5..f8cc195 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -35,9 +35,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -70,6 +67,9 @@ __FBSDID("$FreeBSD$"); * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Driver for the Broadcom BCM5201/BCM5202 "Mini-Theta" PHYs. This also * drives the PHY on the 3Com 3c905C. The 3c905C's PHY is described in diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 15ae23d..f24e05e 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -38,9 +38,6 @@ __FBSDID("$FreeBSD$"); * 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> diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index 5b4b8f5..8bc1dc8 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -42,9 +42,6 @@ __FBSDID("$FreeBSD$"); * which is harder to do. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index 97c97cd..9145772 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -37,9 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -69,13 +66,13 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * driver for 3Com internal PHYs */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index 57fbe16..db5c100 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -38,9 +38,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -70,14 +67,14 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * driver for Level One's LXT-970 ethernet 10/100 PHY * datasheet from www.level1.com */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index a22330b..111f3e7 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -46,9 +46,6 @@ __FBSDID("$FreeBSD$"); * plus some NetBSD extensions. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index d458817..538e5fe 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -44,9 +44,6 @@ __FBSDID("$FreeBSD$"); * Subroutines common to all PHYs. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index 0cd6133..b7bb82a 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -54,9 +54,6 @@ __FBSDID("$FreeBSD$"); * 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> diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 0f0be74..7968498 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -37,9 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -69,14 +66,14 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * driver for National Semiconductor's DP83840A ethernet 10/100 PHY * 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> diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c index f952574..50986dc 100644 --- a/sys/dev/mii/pnaphy.c +++ b/sys/dev/mii/pnaphy.c @@ -43,9 +43,6 @@ __FBSDID("$FreeBSD$"); * to optimize the link. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c index 4cfed03..63891f5 100644 --- a/sys/dev/mii/pnphy.c +++ b/sys/dev/mii/pnphy.c @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); * 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> diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 2c2bd6a..2f09eeb 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -1,7 +1,4 @@ /* OpenBSD: qsphy.c,v 1.6 2000/08/26 20:04:18 nate Exp */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); /* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /*- @@ -70,14 +67,14 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * driver for Quality Semiconductor's QS6612 ethernet 10/100 PHY * datasheet from www.qualitysemi.com */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c index 84681ed..39c478e 100644 --- a/sys/dev/mii/rgephy.c +++ b/sys/dev/mii/rgephy.c @@ -30,13 +30,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 1847586..d6d4e1b 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -37,9 +37,6 @@ __FBSDID("$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> diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c index b21311f..c5efb69 100644 --- a/sys/dev/mii/tdkphy.c +++ b/sys/dev/mii/tdkphy.c @@ -43,9 +43,6 @@ __FBSDID("$FreeBSD$"); * way. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index cf3ce2e..ff00a47 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -37,9 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -69,13 +66,13 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * 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> diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index 6fd52ab..c75bd6c 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -37,9 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * @@ -69,13 +66,13 @@ __FBSDID("$FreeBSD$"); * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * driver for generic unknown PHYs */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c index ca26b95..123d529 100644 --- a/sys/dev/mii/ukphy_subr.c +++ b/sys/dev/mii/ukphy_subr.c @@ -44,9 +44,6 @@ __FBSDID("$FreeBSD$"); * 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> diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index 22ecd73..bba5f79 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD$"); * 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> |