Back out DIAGNOSTIC changes.

7 files changed, 6 insertions, 14 deletions

diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 1db865a..1c60ef0 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -36,7 +36,6 @@
  * IP <=> ATM address resolution.
  */
 
-#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_natm.h"
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 231581c..a215169 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.30 1997/08/02 14:32:50 bde Exp $
+ *	$Id: in_rmx.c,v 1.31 1998/02/04 22:33:05 eivind Exp $
  */
 
 /*
@@ -42,8 +42,6 @@
  *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 6828b3f..dc9b049 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.18 1998/01/27 09:15:06 davidg Exp $
+ *	$Id: ip_divert.c,v 1.19 1998/02/04 22:33:06 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #ifndef INET
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index d556860..86b6368 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.74 1998/02/04 22:33:07 eivind Exp $
+ *	$Id: ip_fw.c,v 1.75 1998/02/06 02:45:54 alex Exp $
  */
 
 /*
@@ -20,7 +20,6 @@
  */
 
 #ifndef IPFIREWALL_MODULE
-#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 456d7be..5923d4e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,14 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.73 1998/01/09 03:21:04 eivind Exp $
+ * $Id: ip_input.c,v 1.74 1998/02/04 22:33:08 eivind Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
 #define	_IP_VHL
 
 #include "opt_bootp.h"
-#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 0885dc2..b8068d3 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,10 +9,9 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.42 1997/10/28 15:58:50 bde Exp $
+ * $Id: ip_mroute.c,v 1.43 1998/02/04 22:33:08 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 317b4d1..ef77921 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.62 1997/11/07 09:20:45 phk Exp $
+ *	$Id: ip_output.c,v 1.63 1998/02/04 22:33:09 eivind Exp $
  */
 
 #define _IP_VHL
 
-#include "opt_diagnostic.h"
 #include "opt_ipdivert.h"
 
 #include <sys/param.h>