[src/trunk]: src/sys Change the way ALTQ is enabled in the kernel, as there i...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02b7816df368
branches:  trunk
changeset: 500648:02b7816df368
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Dec 14 22:36:48 2000 +0000

description:
Change the way ALTQ is enabled in the kernel, as there is an
annoying include file name clash.

diffstat:

 sys/altq/if_altq.h |  6 +++++-
 sys/conf/files     |  4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 6fe0173c96a1 -r 02b7816df368 sys/altq/if_altq.h
--- a/sys/altq/if_altq.h        Thu Dec 14 22:28:31 2000 +0000
+++ b/sys/altq/if_altq.h        Thu Dec 14 22:36:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_altq.h,v 1.3 2000/12/14 18:51:10 thorpej Exp $      */
+/*     $NetBSD: if_altq.h,v 1.4 2000/12/14 22:36:48 thorpej Exp $      */
 /*     $KAME: if_altq.h,v 1.5 2000/12/14 08:12:47 thorpej Exp $        */
 
 /*
@@ -29,6 +29,10 @@
 #ifndef _ALTQ_IF_ALTQ_H_
 #define        _ALTQ_IF_ALTQ_H_
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_altq_enabled.h"
+#endif
+
 struct altq_pktattr; struct tb_regulator; struct top_cdnr;
 
 /*
diff -r 6fe0173c96a1 -r 02b7816df368 sys/conf/files
--- a/sys/conf/files    Thu Dec 14 22:28:31 2000 +0000
+++ b/sys/conf/files    Thu Dec 14 22:36:48 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.410 2000/12/14 17:41:38 thorpej Exp $
+#      $NetBSD: files,v 1.411 2000/12/14 22:36:49 thorpej Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -79,6 +79,7 @@
 defopt TCP_RECVSPACE
 defopt TCP_SENDSPACE
 
+defopt opt_altq_enabled.h ALTQ
 defopt opt_altq.h      ALTQ_CBQ ALTQ_WFQ ALTQ_FIFOQ ALTQ_RED ALTQ_FLOWVALVE
                        ALTQ_RIO ALTQ_LOCALQ ALTQ_HFSC ALTQ_CDNR ALTQ_BLUE
                        ALTQ_PRIQ ALTQ_NOPCC ALTQ_DEBUG
@@ -584,7 +585,6 @@
 defpseudo gif: ifnet
 defpseudo faith: ifnet
 defpseudo stf: ifnet
-defpseudo altq: ifnet
 
 defpseudo sequencer