From 430df5f4b75085bc187ec0bc2b2b53182c8bf03b Mon Sep 17 00:00:00 2001
From: Eivind Eklund <eivind@FreeBSD.org>
Date: Mon, 15 Dec 1997 20:31:25 +0000
Subject: Throw options IPX, IPXIP and IPTUNNEL into opt_ipx.h.

The #ifdef IPXIP in netipx/ipx_if.h is OK (used from ipx_usrreq.c and
ifconfig.c only).

I also fixed a typo IPXTUNNEL -> IPTUNNEL (and #ifdef'ed out the code
inside, as it never could have compiled - doh.)
---
 sys/dev/de/if_de.c | 4 +++-
 sys/dev/ep/if_ep.c | 3 ++-
 sys/dev/ex/if_ex.c | 3 ++-
 sys/dev/fe/if_fe.c | 3 ++-
 sys/dev/ie/if_ie.c | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 2ca1d6455b05..f94d42fa6821 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.74 1997/11/08 14:46:53 peter Exp $ */
+/*	$Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,6 +39,8 @@
  */
 #define	TULIP_HDR_DATA
 
+#include "opt_ipx.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index b0296793b9a9..5c55256a0cfa 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.67 1997/11/20 15:48:32 nate Exp $
+ *  $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -60,6 +60,7 @@
 #if NEP > 0
 
 #include "bpfilter.h"
+#include "opt_ipx.h"
 
 #include <sys/param.h>
 #if defined(__FreeBSD__)
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 6599e603adf9..78500eb518bb 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $
+ *	$Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $
  */
 
 /*
@@ -38,6 +38,7 @@
 #include "ex.h"
 #if NEX > 0
 #include "bpfilter.h"
+#include "opt_ipx.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 866f505e3b69..115b85e54db1 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.34 1997/11/07 08:52:39 phk Exp $
+ * $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -72,6 +72,7 @@
 
 #include "fe.h"
 #include "bpfilter.h"
+#include "opt_ipx.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index d60ce4c8a58e..daab501fe6ea 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.46 1997/09/21 21:41:08 gibbs Exp $
+ *	$Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $
  */
 
 /*
@@ -108,6 +108,7 @@ iomem and and with 0xffff.
 
 #include "ie.h"
 #if NIE > 0
+#include "opt_ipx.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-- 
cgit v1.3