From 920c17857f5a57e1e6be3cdea9530335c6840d36 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 29 Jan 2001 12:27:46 +0000
Subject: [PATCH] Stop counting sppp interfaces, we were just testing its
 presence to give a warning if it was missing.

---
 sys/conf/files             | 2 +-
 sys/dev/ar/if_ar.c         | 7 -------
 sys/dev/ar/if_ar_isa.c     | 7 -------
 sys/dev/sr/if_sr.c         | 7 -------
 sys/dev/sr/if_sr_isa.c     | 7 -------
 sys/i386/isa/if_ar.c       | 7 -------
 sys/i386/isa/if_sr.c       | 7 -------
 sys/i4b/driver/i4b_isppp.c | 4 ----
 8 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 1b2378c21d29..a149f111769c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -797,7 +797,7 @@ net/if_media.c		standard
 net/if_mib.c		standard
 net/if_ppp.c		count ppp
 net/if_sl.c		optional sl
-net/if_spppsubr.c	count sppp
+net/if_spppsubr.c	optional sppp
 net/if_stf.c		count stf
 net/if_tun.c		optional tun
 net/if_tap.c		optional tap
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 231ca6be2b72..e610972467d0 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -81,13 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/if_arregs.h>
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error device 'ar' require sppp.
-#endif /* NSPPP <= 0 */
-#endif /* NETGRAPH */
-
 #ifdef TRACE
 #define TRC(x)               x
 #else
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 231ca6be2b72..e610972467d0 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -81,13 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/if_arregs.h>
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error device 'ar' require sppp.
-#endif /* NSPPP <= 0 */
-#endif /* NETGRAPH */
-
 #ifdef TRACE
 #define TRC(x)               x
 #else
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 830b595b08b4..a52369bed9e6 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -53,13 +53,6 @@
 #include <i386/isa/if_sr.h>
 #endif	/* NETGRAPH */
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error Device 'sr' requires sppp.
-#endif
-#endif	/* NETGRAPH */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 830b595b08b4..a52369bed9e6 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -53,13 +53,6 @@
 #include <i386/isa/if_sr.h>
 #endif	/* NETGRAPH */
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error Device 'sr' requires sppp.
-#endif
-#endif	/* NETGRAPH */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 231ca6be2b72..e610972467d0 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -81,13 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/if_arregs.h>
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error device 'ar' require sppp.
-#endif /* NSPPP <= 0 */
-#endif /* NETGRAPH */
-
 #ifdef TRACE
 #define TRC(x)               x
 #else
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 830b595b08b4..a52369bed9e6 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -53,13 +53,6 @@
 #include <i386/isa/if_sr.h>
 #endif	/* NETGRAPH */
 
-#ifndef NETGRAPH
-#include "sppp.h"
-#if NSPPP <= 0
-#error Device 'sr' requires sppp.
-#endif
-#endif	/* NETGRAPH */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 0be5efa03efa..2a6dd35420a9 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -50,10 +50,6 @@
 
 #ifndef USE_ISPPP
 
-#ifdef __FreeBSD__
-#include "sppp.h"
-#endif
-
 #ifndef __NetBSD__
 #if NI4BISPPP == 0
 # error "You need to define `pseudo-device sppp <N>' with options ISPPP"