[kernel] r11560 - in dists/trunk/linux-2.6/debian/config: arm m68k mips mipsel
Bastian Blank
waldi at alioth.debian.org
Sat Jun 7 13:19:26 UTC 2008
Author: waldi
Date: Sat Jun 7 13:19:25 2008
New Revision: 11560
Log:
* debian/config/arm, debian/config/mipsel/config.r5k-cobalt:
Remove duplicated XFRM options.
* debian/config/m68k/config: Mark XFRM options.
Modified:
dists/trunk/linux-2.6/debian/config/arm/config.footbridge
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/m68k/config
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.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.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
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:19:25 2008
@@ -1336,6 +1336,7 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
# CONFIG_NET_KEY is not set
##
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 13:19:25 2008
@@ -846,12 +846,6 @@
# CONFIG_X25 is not set
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_SEQUENCER=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 13:19:25 2008
@@ -833,12 +833,6 @@
CONFIG_X25=m
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_SEQUENCER=m
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:19:25 2008
@@ -297,5 +297,6 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_NET_KEY=y
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 13:19:25 2008
@@ -1744,13 +1744,6 @@
CONFIG_X25=m
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_NET_KEY=m
-
-##
## file: sound/Kconfig
##
CONFIG_SOUND=y
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:19:25 2008
@@ -2070,15 +2070,6 @@
CONFIG_X25=m
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-
-##
## file: sound/Kconfig
##
CONFIG_SOUND=y
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 13:19:25 2008
@@ -708,7 +708,9 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_XFRM_USER=y
+#. TODO
CONFIG_NET_KEY=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 13:19:25 2008
@@ -432,7 +432,9 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_XFRM_USER=y
+#. TODO
CONFIG_NET_KEY=y
##
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 13:19:25 2008
@@ -1057,7 +1057,9 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_XFRM_USER=y
+#. TODO
CONFIG_NET_KEY=y
##
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 13:19:25 2008
@@ -1730,13 +1730,6 @@
CONFIG_X25=m
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_NET_KEY=m
-
-##
## file: sound/Kconfig
##
CONFIG_SOUND=y
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:19:25 2008
@@ -2069,15 +2069,6 @@
CONFIG_X25=m
##
-## file: net/xfrm/Kconfig
-##
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-
-##
## file: sound/Kconfig
##
CONFIG_SOUND=y
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 13:19:25 2008
@@ -1069,7 +1069,9 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_XFRM_USER=y
+#. TODO
CONFIG_NET_KEY=y
##
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 13:19:25 2008
@@ -1056,7 +1056,9 @@
##
## file: net/xfrm/Kconfig
##
+#. TODO
CONFIG_XFRM_USER=y
+#. TODO
CONFIG_NET_KEY=y
##
More information about the Kernel-svn-changes
mailing list