aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/prof_machdep.c5
-rw-r--r--sys/amd64/isa/nmi.c4
-rw-r--r--sys/dev/cy/cy.c5
-rw-r--r--sys/dev/cy/cy_isa.c5
-rw-r--r--sys/dev/mse/mse.c6
-rw-r--r--sys/dev/pcf/pcf.c7
-rw-r--r--sys/dev/speaker/spkr.c5
-rw-r--r--sys/i386/isa/asc.c6
-rw-r--r--sys/i386/isa/clock.c4
-rw-r--r--sys/i386/isa/cronyx.c4
-rw-r--r--sys/i386/isa/ctx.c9
-rw-r--r--sys/i386/isa/cx.c7
-rw-r--r--sys/i386/isa/cy.c5
-rw-r--r--sys/i386/isa/elink.c5
-rw-r--r--sys/i386/isa/gpib.c5
-rw-r--r--sys/i386/isa/gsc.c6
-rw-r--r--sys/i386/isa/if_cx.c7
-rw-r--r--sys/i386/isa/if_el.c6
-rw-r--r--sys/i386/isa/if_le.c5
-rw-r--r--sys/i386/isa/if_rdp.c5
-rw-r--r--sys/i386/isa/intr_machdep.c4
-rw-r--r--sys/i386/isa/isa.c5
-rw-r--r--sys/i386/isa/isa_compat.c5
-rw-r--r--sys/i386/isa/isa_dma.c4
-rw-r--r--sys/i386/isa/istallion.c5
-rw-r--r--sys/i386/isa/ithread.c4
-rw-r--r--sys/i386/isa/loran.c5
-rw-r--r--sys/i386/isa/mse.c6
-rw-r--r--sys/i386/isa/nmi.c4
-rw-r--r--sys/i386/isa/npx.c4
-rw-r--r--sys/i386/isa/pcaudio.c5
-rw-r--r--sys/i386/isa/pcf.c7
-rw-r--r--sys/i386/isa/pmtimer.c5
-rw-r--r--sys/i386/isa/prof_machdep.c5
-rw-r--r--sys/i386/isa/spic.c5
-rw-r--r--sys/i386/isa/spigot.c6
-rw-r--r--sys/i386/isa/spkr.c5
-rw-r--r--sys/i386/isa/stallion.c5
-rw-r--r--sys/i386/isa/vesa.c5
-rw-r--r--sys/i386/isa/wt.c5
-rw-r--r--sys/isa/atrtc.c4
41 files changed, 130 insertions, 84 deletions
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 65d35f832e47..4c3a21e2135e 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -22,10 +22,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$");
+
#ifdef GUPROF
#include "opt_i586_guprof.h"
#include "opt_perfmon.h"
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index b0269555f2fc..9a3a8074c16b 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_auto_eoi.h"
#include "opt_isa.h"
#include "opt_mca.h"
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 4e2e499da1a6..c8f24599352b 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -26,10 +26,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_compat.h"
#include "cy.h"
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 4e2e499da1a6..c8f24599352b 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -26,10 +26,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_compat.h"
#include "cy.h"
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 57b0e7b1f15c..bb79f280e9a9 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -10,9 +10,11 @@
* University of Guelph makes no representations about the suitability of
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
- *
- * $FreeBSD$
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
* the X386 port, courtesy of
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 8c1d4886ca12..22ef678e5501 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -22,10 +22,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$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index f51f4609a4cb..be3ad4209310 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,10 +4,11 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
* modified for PC98 by Kakefuda
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index d231807b49e8..e3046830c38a 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -33,9 +33,9 @@
* (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 "asc.h"
#include <sys/param.h>
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 9d87758bc93c..42888aa7fe26 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Routines to handle clock hardware.
*/
diff --git a/sys/i386/isa/cronyx.c b/sys/i386/isa/cronyx.c
index 13286d55825f..836df217773b 100644
--- a/sys/i386/isa/cronyx.c
+++ b/sys/i386/isa/cronyx.c
@@ -12,8 +12,10 @@
* all derivative works or modified versions.
*
* Version 1.6, Wed May 31 16:03:20 MSD 1995
- * $FreeBSD$
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#if defined (MSDOS) || defined (__MSDOS__)
# include <string.h>
# include <dos.h>
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index bc6564e77ac4..db26c40ba7b2 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -7,14 +7,12 @@
* no circumstances is the author responsible for the proper functioning
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
- *
- *
- *
* Device Driver for CORTEX-I Frame Grabber
* Made by ImageNation Corporation
* 1200 N.E. Keyues Road
@@ -105,7 +103,6 @@
* Obviously, this sort of ugliness needs to be hidden away from
* the casual user, with an appropriate set of higher level
* functions.
- *
*/
#include <sys/param.h>
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 5f5f92e74e0f..c0fc028abe24 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -14,10 +14,11 @@
* all derivative works or modified versions.
*
* Version 1.9, Wed Oct 4 18:58:15 MSK 1995
- *
- * $FreeBSD$
- *
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#undef DEBUG
#include "cx.h"
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 4e2e499da1a6..c8f24599352b 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -26,10 +26,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_compat.h"
#include "cy.h"
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 13eb8247e167..50e3068eb09a 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -25,10 +25,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Common code for dealing with 3COM ethernet cards.
*/
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index d0eb6586d1a3..26102df178b3 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -14,10 +14,11 @@
* The author grants any other persons or organizations permission to use
* or modify this software as long as this message is kept with the software,
* all derivative works or modified versions.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/* Please read the README file for usage information */
#include <sys/param.h>
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index b435ceda228b..a59f49345e33 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -30,11 +30,11 @@
* 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.
- *
- * $FreeBSD$
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "gsc.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 4f27fd0d3abe..192ab64b5b9f 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -15,10 +15,11 @@
* all derivative works or modified versions.
*
* Version 1.9, Wed Oct 4 18:58:15 MSK 1995
- *
- * $FreeBSD$
- *
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#undef DEBUG
#include "cx.h"
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index dd6236526d04..de28c81d39a6 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -5,9 +5,11 @@
* portions thereof.
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
- *
- * $FreeBSD$
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
*/
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 808e1be16588..e55fe963225a 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -20,10 +20,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* DEC EtherWORKS 2 Ethernet Controllers
* DEC EtherWORKS 3 Ethernet Controllers
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 73d29c5b7913..be8a2a70006c 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.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 RealTek RTL 8002 (`REDP') based pocket-ethernet
* adapters, hooked up to a printer port. `rdp' is a shorthand for
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index b0269555f2fc..9a3a8074c16b 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_auto_eoi.h"
#include "opt_isa.h"
#include "opt_mca.h"
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index bd1df3229b92..c1c9626e5400 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -22,10 +22,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$");
+
/*
* Modifications for Intel architecture by Garrett A. Wollman.
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c
index 8035c6df66ff..e2a2a7a458ce 100644
--- a/sys/i386/isa/isa_compat.c
+++ b/sys/i386/isa/isa_compat.c
@@ -22,10 +22,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$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index 381bd7547461..5af50705ffd1 100644
--- a/sys/i386/isa/isa_dma.c
+++ b/sys/i386/isa/isa_dma.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* code to manage AT bus
*
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index e94277299a2e..f9bea0cb7f1b 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -32,10 +32,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$");
+
/*****************************************************************************/
#include "opt_compat.h"
diff --git a/sys/i386/isa/ithread.c b/sys/i386/isa/ithread.c
index ee619845092b..8c11bcbfdcb7 100644
--- a/sys/i386/isa/ithread.c
+++ b/sys/i386/isa/ithread.c
@@ -26,9 +26,11 @@
* SUCH DAMAGE.
*
* From BSDI: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/* Interrupt thread code. */
#include <sys/param.h>
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index a2fa8eaf0b3d..772a232fe5e7 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,6 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD$
*
* This device-driver helps the userland controlprogram for a LORAN-C
* receiver avoid monopolizing the CPU.
@@ -17,9 +16,11 @@
*
* Details can be found at:
* ftp://ftp.eecis.udel.edu/pub/ntp/loran.tar.Z
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 57b0e7b1f15c..bb79f280e9a9 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -10,9 +10,11 @@
* University of Guelph makes no representations about the suitability of
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
- *
- * $FreeBSD$
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
* the X386 port, courtesy of
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index b0269555f2fc..9a3a8074c16b 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_auto_eoi.h"
#include "opt_isa.h"
#include "opt_mca.h"
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 8dadb6bcc9c3..c44f78929556 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,9 +32,11 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_cpu.h"
#include "opt_debug_npx.h"
#include "opt_isa.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 170407f39923..1fc3b39489bf 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -24,10 +24,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 8c1d4886ca12..22ef678e5501 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -22,10 +22,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$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/i386/isa/pmtimer.c b/sys/i386/isa/pmtimer.c
index fcb6f491939c..e9a18cc30686 100644
--- a/sys/i386/isa/pmtimer.c
+++ b/sys/i386/isa/pmtimer.c
@@ -22,10 +22,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$");
+
/*
* Timer device driver for power management events.
* The code for suspend/resume is derived from APM device driver.
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 65d35f832e47..4c3a21e2135e 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -22,10 +22,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$");
+
#ifdef GUPROF
#include "opt_i586_guprof.h"
#include "opt_perfmon.h"
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index 7331f74d82c7..9eace580cf28 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -46,10 +46,11 @@
* What documentation exists is thanks to Andrew Tridge, and his page at
* http://samba.org/picturebook/ Special thanks also to Ian Dowse, who
* also provided sample code upon which this driver was based.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 2cbdc39c062d..b07066bdad3a 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -41,11 +41,11 @@
* ftp.cs.uwm.edu://pub/FreeBSD-UWM/spigot/spigot.tar.gz
*
* Version 1.7, December 1995.
- *
- * $FreeBSD$
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "spigot.h"
#if NSPIGOT > 1
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index f51f4609a4cb..be3ad4209310 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,10 +4,11 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
* modified for PC98 by Kakefuda
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 79cd0ff5b418..565fda3ce274 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -32,10 +32,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$");
+
/*****************************************************************************/
#define TTYDEFCHARS 1
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 908b3749ae33..ebb41ff0c19b 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_vga.h"
#include "opt_vesa.h"
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index f994a7ef47cb..1f9d16e668bf 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,10 +20,11 @@
* the original CMU copyright notice.
*
* Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $FreeBSD$
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Code for MTERASE added by John Lind (john@starfire.mn.org) 95/09/02.
* This was very easy due to the excellent structure and clear coding
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 9d87758bc93c..42888aa7fe26 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Routines to handle clock hardware.
*/