[kernel] r11550 - in dists/trunk/linux-2.6/debian/config: arm mips mipsel
Bastian Blank
waldi at alioth.debian.org
Sat Jun 7 12:38:35 UTC 2008
Author: waldi
Date: Sat Jun 7 12:38:34 2008
New Revision: 11550
Log:
debian/config/arm, debian/config/mips, debian/config/mipsel:
Remove duplicated network options.
Modified:
dists/trunk/linux-2.6/debian/config/arm/config.iop32x
dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-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/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Sat Jun 7 12:38:34 2008
@@ -756,11 +756,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_INET=y
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Sat Jun 7 12:38:34 2008
@@ -749,14 +749,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Sat Jun 7 12:38:34 2008
@@ -1600,17 +1600,6 @@
# CONFIG_RESOURCES_64BIT is not set
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_NET_PKTGEN=m
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
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 12:38:34 2008
@@ -1911,17 +1911,6 @@
CONFIG_RESOURCES_64BIT=y
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_NET_PKTGEN=m
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Sat Jun 7 12:38:34 2008
@@ -562,11 +562,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Sat Jun 7 12:38:34 2008
@@ -681,14 +681,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-##
## file: net/ipv4/Kconfig
##
CONFIG_IP_MULTICAST=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Sat Jun 7 12:38:34 2008
@@ -332,14 +332,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Sat Jun 7 12:38:34 2008
@@ -957,14 +957,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Sat Jun 7 12:38:34 2008
@@ -1586,17 +1586,6 @@
# CONFIG_RESOURCES_64BIT is not set
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_NET_PKTGEN=m
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
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 12:38:34 2008
@@ -1910,17 +1910,6 @@
CONFIG_RESOURCES_64BIT=y
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_NET_PKTGEN=m
-
-##
## file: net/atm/Kconfig
##
CONFIG_ATM=m
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 12:38:34 2008
@@ -830,11 +830,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Sat Jun 7 12:38:34 2008
@@ -969,14 +969,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Sat Jun 7 12:38:34 2008
@@ -956,14 +956,6 @@
## end choice
##
-## file: net/Kconfig
-##
-CONFIG_NET=y
-CONFIG_INET=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
More information about the Kernel-svn-changes
mailing list