From bf0fc89780038c5c1e5809d7d3e35c4f93090378 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Fri, 4 May 2007 13:30:44 +0000
Subject: $FreeBSD$ tags are not compilable C code; wrap in either __FBSDID()
 or in comments for .c and .h files respectively.  Jack may want to clean up
 style or other aspects once he's up and about again, but this gets the kernel
 compiling.

---
 sys/dev/em/e1000_80003es2lan.c | 4 +++-
 sys/dev/em/e1000_80003es2lan.h | 5 ++++-
 sys/dev/em/e1000_82540.c       | 4 +++-
 sys/dev/em/e1000_82541.c       | 4 +++-
 sys/dev/em/e1000_82541.h       | 5 ++++-
 sys/dev/em/e1000_82542.c       | 4 +++-
 sys/dev/em/e1000_82543.c       | 4 +++-
 sys/dev/em/e1000_82543.h       | 5 ++++-
 sys/dev/em/e1000_82571.c       | 4 +++-
 sys/dev/em/e1000_82571.h       | 5 ++++-
 sys/dev/em/e1000_82575.c       | 4 +++-
 sys/dev/em/e1000_82575.h       | 5 ++++-
 sys/dev/em/e1000_api.c         | 4 +++-
 sys/dev/em/e1000_api.h         | 5 ++++-
 sys/dev/em/e1000_defines.h     | 5 ++++-
 sys/dev/em/e1000_hw.h          | 5 ++++-
 sys/dev/em/e1000_ich8lan.c     | 4 +++-
 sys/dev/em/e1000_ich8lan.h     | 5 ++++-
 sys/dev/em/e1000_mac.c         | 4 +++-
 sys/dev/em/e1000_mac.h         | 5 ++++-
 sys/dev/em/e1000_manage.c      | 4 +++-
 sys/dev/em/e1000_manage.h      | 5 ++++-
 sys/dev/em/e1000_nvm.c         | 4 +++-
 sys/dev/em/e1000_nvm.h         | 5 ++++-
 sys/dev/em/e1000_osdep.h       | 5 ++++-
 sys/dev/em/e1000_phy.c         | 4 +++-
 sys/dev/em/e1000_phy.h         | 5 ++++-
 sys/dev/em/e1000_regs.h        | 5 ++++-
 sys/dev/em/if_em.c             | 3 ++-
 sys/dev/em/if_em.h             | 5 ++++-
 30 files changed, 105 insertions(+), 30 deletions(-)

(limited to 'sys/dev/em')

diff --git a/sys/dev/em/e1000_80003es2lan.c b/sys/dev/em/e1000_80003es2lan.c
index 5e28aaf..4eedc52 100644
--- a/sys/dev/em/e1000_80003es2lan.c
+++ b/sys/dev/em/e1000_80003es2lan.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* e1000_80003es2lan
  */
diff --git a/sys/dev/em/e1000_80003es2lan.h b/sys/dev/em/e1000_80003es2lan.h
index 3d97585..2b219ca 100644
--- a/sys/dev/em/e1000_80003es2lan.h
+++ b/sys/dev/em/e1000_80003es2lan.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_80003ES2LAN_H_
diff --git a/sys/dev/em/e1000_82540.c b/sys/dev/em/e1000_82540.c
index dd38d24..7867b2f 100644
--- a/sys/dev/em/e1000_82540.c
+++ b/sys/dev/em/e1000_82540.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82540
diff --git a/sys/dev/em/e1000_82541.c b/sys/dev/em/e1000_82541.c
index d6a5b14..25481de 100644
--- a/sys/dev/em/e1000_82541.c
+++ b/sys/dev/em/e1000_82541.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82541
diff --git a/sys/dev/em/e1000_82541.h b/sys/dev/em/e1000_82541.h
index 2e8cf43..166a7c3 100644
--- a/sys/dev/em/e1000_82541.h
+++ b/sys/dev/em/e1000_82541.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82541_H_
diff --git a/sys/dev/em/e1000_82542.c b/sys/dev/em/e1000_82542.c
index 7ef4ad9..56cfdd2 100644
--- a/sys/dev/em/e1000_82542.c
+++ b/sys/dev/em/e1000_82542.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82542 (rev 1 & 2)
diff --git a/sys/dev/em/e1000_82543.c b/sys/dev/em/e1000_82543.c
index 7a7147c..34efae5 100644
--- a/sys/dev/em/e1000_82543.c
+++ b/sys/dev/em/e1000_82543.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82543
diff --git a/sys/dev/em/e1000_82543.h b/sys/dev/em/e1000_82543.h
index 05d05f8..53a946e 100644
--- a/sys/dev/em/e1000_82543.h
+++ b/sys/dev/em/e1000_82543.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82543_H_
diff --git a/sys/dev/em/e1000_82571.c b/sys/dev/em/e1000_82571.c
index a48e7aac..959027e 100644
--- a/sys/dev/em/e1000_82571.c
+++ b/sys/dev/em/e1000_82571.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82571
diff --git a/sys/dev/em/e1000_82571.h b/sys/dev/em/e1000_82571.h
index f388d96..b36c3fa 100644
--- a/sys/dev/em/e1000_82571.h
+++ b/sys/dev/em/e1000_82571.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82571_H_
diff --git a/sys/dev/em/e1000_82575.c b/sys/dev/em/e1000_82575.c
index ed91b1f..65eeb12 100644
--- a/sys/dev/em/e1000_82575.c
+++ b/sys/dev/em/e1000_82575.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82575
diff --git a/sys/dev/em/e1000_82575.h b/sys/dev/em/e1000_82575.h
index 505316f..072e000 100644
--- a/sys/dev/em/e1000_82575.h
+++ b/sys/dev/em/e1000_82575.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82575_H_
diff --git a/sys/dev/em/e1000_api.c b/sys/dev/em/e1000_api.c
index 7a778f5..1d05ee4 100644
--- a/sys/dev/em/e1000_api.c
+++ b/sys/dev/em/e1000_api.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_mac.h"
diff --git a/sys/dev/em/e1000_api.h b/sys/dev/em/e1000_api.h
index 33ff807..13f9d89 100644
--- a/sys/dev/em/e1000_api.h
+++ b/sys/dev/em/e1000_api.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_API_H_
diff --git a/sys/dev/em/e1000_defines.h b/sys/dev/em/e1000_defines.h
index 3c96fdf..5969d74 100644
--- a/sys/dev/em/e1000_defines.h
+++ b/sys/dev/em/e1000_defines.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_DEFINES_H_
diff --git a/sys/dev/em/e1000_hw.h b/sys/dev/em/e1000_hw.h
index 99ff504..ed3b0e9 100644
--- a/sys/dev/em/e1000_hw.h
+++ b/sys/dev/em/e1000_hw.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_HW_H_
diff --git a/sys/dev/em/e1000_ich8lan.c b/sys/dev/em/e1000_ich8lan.c
index 00893c7..912b949 100644
--- a/sys/dev/em/e1000_ich8lan.c
+++ b/sys/dev/em/e1000_ich8lan.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_ich8lan
diff --git a/sys/dev/em/e1000_ich8lan.h b/sys/dev/em/e1000_ich8lan.h
index edf9242..93123d4 100644
--- a/sys/dev/em/e1000_ich8lan.h
+++ b/sys/dev/em/e1000_ich8lan.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_ICH8LAN_H_
diff --git a/sys/dev/em/e1000_mac.c b/sys/dev/em/e1000_mac.c
index 5566cc3..9f0f1b8 100644
--- a/sys/dev/em/e1000_mac.c
+++ b/sys/dev/em/e1000_mac.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_mac.h"
diff --git a/sys/dev/em/e1000_mac.h b/sys/dev/em/e1000_mac.h
index a2969a9..b41e897 100644
--- a/sys/dev/em/e1000_mac.h
+++ b/sys/dev/em/e1000_mac.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_MAC_H_
diff --git a/sys/dev/em/e1000_manage.c b/sys/dev/em/e1000_manage.c
index 8efaab3..9a0342d 100644
--- a/sys/dev/em/e1000_manage.c
+++ b/sys/dev/em/e1000_manage.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_manage.h"
diff --git a/sys/dev/em/e1000_manage.h b/sys/dev/em/e1000_manage.h
index 45ec648..e34108c 100644
--- a/sys/dev/em/e1000_manage.h
+++ b/sys/dev/em/e1000_manage.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_MANAGE_H_
diff --git a/sys/dev/em/e1000_nvm.c b/sys/dev/em/e1000_nvm.c
index a64bd4c..1922435 100644
--- a/sys/dev/em/e1000_nvm.c
+++ b/sys/dev/em/e1000_nvm.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_nvm.h"
diff --git a/sys/dev/em/e1000_nvm.h b/sys/dev/em/e1000_nvm.h
index b6b8c4a..572dc68 100644
--- a/sys/dev/em/e1000_nvm.h
+++ b/sys/dev/em/e1000_nvm.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_NVM_H_
diff --git a/sys/dev/em/e1000_osdep.h b/sys/dev/em/e1000_osdep.h
index 3ff2bec..fe20a34 100644
--- a/sys/dev/em/e1000_osdep.h
+++ b/sys/dev/em/e1000_osdep.h
@@ -30,7 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _FREEBSD_OS_H_
diff --git a/sys/dev/em/e1000_phy.c b/sys/dev/em/e1000_phy.c
index 057e3fb..18f5252 100644
--- a/sys/dev/em/e1000_phy.c
+++ b/sys/dev/em/e1000_phy.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_phy.h"
diff --git a/sys/dev/em/e1000_phy.h b/sys/dev/em/e1000_phy.h
index 0eace24..eb9632c 100644
--- a/sys/dev/em/e1000_phy.h
+++ b/sys/dev/em/e1000_phy.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_PHY_H_
diff --git a/sys/dev/em/e1000_regs.h b/sys/dev/em/e1000_regs.h
index 57a8e6b..1f75021 100644
--- a/sys/dev/em/e1000_regs.h
+++ b/sys/dev/em/e1000_regs.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_REGS_H_
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 68ee526..90ba2ed 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -31,7 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-$FreeBSD$
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index c41b065..b54f779 100644
--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@@ -30,7 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
-- 
cgit v1.1