From 3a4a897d90de67d42770e624e4a4ddae7c622b57 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 9 Mar 2009 09:59:21 +0000 Subject: [PATCH] topconfig centralize ATALK add the missing definitions to topconfig and thus nuke dupes. Reported-by: Martin Michlmayr svn path=/dists/trunk/linux-2.6/; revision=13047 --- debian/config/alpha/config | 10 ---------- debian/config/amd64/config | 8 -------- debian/config/arm/config.iop32x | 8 -------- debian/config/arm/config.ixp4xx | 8 -------- debian/config/arm/config.orion5x | 8 -------- debian/config/config | 7 ++++++- debian/config/i386/config | 9 --------- debian/config/m68k/config | 5 ----- debian/config/mips/config.4kc-malta | 9 --------- debian/config/mips/config.5kc-malta | 9 --------- debian/config/mipsel/config.4kc-malta | 9 --------- debian/config/mipsel/config.5kc-malta | 9 --------- debian/config/powerpc/config | 8 -------- debian/config/sparc/config | 6 ------ 14 files changed, 6 insertions(+), 107 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 3f32b08c0..cbf83bbb5 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -784,16 +784,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m 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 ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 33ff95b6b..e376c3020 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -930,14 +930,6 @@ CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set 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 ## diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 4daf75d99..770e1d16b 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -519,14 +519,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_HP100 is not set # 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 ## diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 82a54bfd9..232f6633e 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -510,14 +510,6 @@ CONFIG_ENC28J60=m CONFIG_NETCONSOLE=m # 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 ## diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x index 3d8605cbd..627dc78d0 100644 --- a/debian/config/arm/config.orion5x +++ b/debian/config/arm/config.orion5x @@ -317,14 +317,6 @@ CONFIG_MV643XX_ETH=m # CONFIG_NETDEV_10000 is not set 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 ## diff --git a/debian/config/config b/debian/config/config index 6d4dff359..1dffe6d59 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1268,7 +1268,12 @@ CONFIG_WIRELESS=y ## ## 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 diff --git a/debian/config/i386/config b/debian/config/i386/config index 19529171b..6c144393f 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1115,15 +1115,6 @@ CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set 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 ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 2ade96f0a..885c8e7dc 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -122,11 +122,6 @@ CONFIG_EQUALIZER=m CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set -## -## file: drivers/net/appletalk/Kconfig -## -CONFIG_ATALK=m - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index b39e133f1..435c889a3 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -962,15 +962,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # 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 ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index dd21daeea..f6ef60056 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1179,15 +1179,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # 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 ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 1ad883975..1a9bf7689 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -961,15 +961,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # 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 ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 78a735ec4..ab45fbac9 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1179,15 +1179,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # 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 ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index e8feb3c00..753b9f730 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -558,14 +558,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m 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 ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 3a1eb4d9c..c0ff7bce6 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -135,12 +135,6 @@ CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # 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 ##