[kernel] r13046 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm i386 mips mipsel powerpc sparc

Maximilian Attems maks at alioth.debian.org
Mon Mar 9 09:59:17 UTC 2009


Author: maks
Date: Mon Mar  9 09:59:15 2009
New Revision: 13046

Log:
topconfig centralize modular LLC2

thus nuke dup definitions

Reported-by: Martin Michlmayr <tbm at cyrius.com>

Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   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/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/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/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/sparc/config

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Mon Mar  9 09:59:15 2009
@@ -1313,11 +1313,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=m

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Mon Mar  9 09:59:15 2009
@@ -1518,11 +1518,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=m

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	Mon Mar  9 09:59:15 2009
@@ -809,11 +809,6 @@
 # CONFIG_LAPB is not set
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 # CONFIG_WAN_ROUTER is not set

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	Mon Mar  9 09:59:15 2009
@@ -874,11 +874,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=m

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile	Mon Mar  9 09:59:15 2009
@@ -509,11 +509,6 @@
 # CONFIG_LAPB is not set
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 # CONFIG_WAN_ROUTER is not set

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Mar  9 09:59:15 2009
@@ -2717,6 +2717,11 @@
 CONFIG_IP6_NF_SECURITY=m
 
 ##
+## file: net/llc/Kconfig
+##
+CONFIG_LLC2=m
+
+##
 ## file: net/mac80211/Kconfig
 ##
 CONFIG_MAC80211=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Mon Mar  9 09:59:15 2009
@@ -1778,11 +1778,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=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	Mon Mar  9 09:59:15 2009
@@ -1597,11 +1597,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/netlabel/Kconfig
 ##
 # CONFIG_NETLABEL 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	Mon Mar  9 09:59:15 2009
@@ -1902,11 +1902,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/netlabel/Kconfig
 ##
 # CONFIG_NETLABEL 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	Mon Mar  9 09:59:15 2009
@@ -1583,11 +1583,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/netlabel/Kconfig
 ##
 # CONFIG_NETLABEL is not set

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	Mon Mar  9 09:59:15 2009
@@ -1901,11 +1901,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/netlabel/Kconfig
 ##
 # CONFIG_NETLABEL is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Mon Mar  9 09:59:15 2009
@@ -1032,11 +1032,6 @@
 CONFIG_LAPB=m
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=m

Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config	Mon Mar  9 09:59:15 2009
@@ -333,11 +333,6 @@
 # CONFIG_LAPB is not set
 
 ##
-## file: net/llc/Kconfig
-##
-CONFIG_LLC2=m
-
-##
 ## file: net/wanrouter/Kconfig
 ##
 # CONFIG_WAN_ROUTER is not set



More information about the Kernel-svn-changes mailing list