[kernel] r11557 - in dists/trunk/linux-2.6/debian/config: arm m68k mips mipsel powerpc s390

Bastian Blank waldi at alioth.debian.org
Sat Jun 7 13:12:24 UTC 2008 

Author: waldi
Date: Sat Jun  7 13:12:23 2008
New Revision: 11557

Log:
debian/config: Remove duplicated network scheduler options.


Modified:
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/m68k/config
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/config/s390/config

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Sat Jun  7 13:12:23 2008
@@ -1314,6 +1314,7 @@
 ##
 ## file: net/sched/Kconfig
 ##
+#. TODO
 # CONFIG_NET_SCHED is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config	Sat Jun  7 13:12:23 2008
@@ -281,6 +281,7 @@
 ##
 ## file: net/sched/Kconfig
 ##
+#. TODO
 # CONFIG_NET_SCHED is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Sat Jun  7 13:12:23 2008
@@ -2050,45 +2050,8 @@
 ##
 ## file: net/sched/Kconfig
 ##
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
+#. TODO
 # CONFIG_NET_EMATCH_META is not set
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_CLS_IND=y
 
 ##
 ## file: net/tipc/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Sat Jun  7 13:12:23 2008
@@ -2049,45 +2049,8 @@
 ##
 ## file: net/sched/Kconfig
 ##
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
+#. TODO
 # CONFIG_NET_EMATCH_META is not set
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_CLS_IND=y
 
 ##
 ## file: net/tipc/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Sat Jun  7 13:12:23 2008
@@ -888,6 +888,7 @@
 ##
 ## file: net/sched/Kconfig
 ##
+#. TODO
 # CONFIG_NET_SCHED is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot	Sat Jun  7 13:12:23 2008
@@ -175,6 +175,7 @@
 ##
 ## file: net/sched/Kconfig
 ##
+#. TODO
 # CONFIG_NET_SCHED is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Sat Jun  7 13:12:23 2008
@@ -216,6 +216,7 @@
 ##
 ## file: net/sched/Kconfig
 ##
+#. TODO
 # CONFIG_NET_SCHED is not set
 
 ##

More information about the Kernel-svn-changes mailing list