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

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

Author: maks
Date: Mon Mar  9 09:59:21 2009
New Revision: 13047

Log:
topconfig centralize ATALK

add the missing definitions to topconfig and thus nuke dupes.

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.orion5x
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config
   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/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:21 2009
@@ -785,16 +785,6 @@
 CONFIG_NETPOLL_TRAP=y
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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:21 2009
@@ -931,14 +931,6 @@
 CONFIG_VIRTIO_NET=m
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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:21 2009
@@ -520,14 +520,6 @@
 # CONFIG_NET_PCI is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET 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:21 2009
@@ -511,14 +511,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set

Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Mon Mar  9 09:59:21 2009
@@ -318,14 +318,6 @@
 CONFIG_NETCONSOLE=m
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET 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:21 2009
@@ -1268,7 +1268,12 @@
 ##
 ## file: drivers/net/appletalk/Kconfig
 ##
-CONFIG_DEV_APPLETALK=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+CONFIG_LTPC=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
 
 ##
 ## file: drivers/net/can/Kconfig

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:21 2009
@@ -1116,15 +1116,6 @@
 CONFIG_VIRTIO_NET=m
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_LTPC=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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	Mon Mar  9 09:59:21 2009
@@ -123,11 +123,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-
-##
 ## file: drivers/net/wan/Kconfig
 ##
 # CONFIG_WAN is not set

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:21 2009
@@ -963,15 +963,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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	Mon Mar  9 09:59:21 2009
@@ -1180,15 +1180,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=m

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:21 2009
@@ -962,15 +962,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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	Mon Mar  9 09:59:21 2009
@@ -1180,15 +1180,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=m

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:21 2009
@@ -559,14 +559,6 @@
 CONFIG_NETPOLL_TRAP=y
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 CONFIG_ARCNET=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:21 2009
@@ -136,12 +136,6 @@
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-# CONFIG_DEV_APPLETALK is not set
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set

More information about the Kernel-svn-changes mailing list