From 86601bf4dd6acb3b4de4f1bb59b2876b4b0a87ce Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 9 Mar 2009 09:59:15 +0000 Subject: [PATCH] topconfig centralize modular LLC2 thus nuke dup definitions Reported-by: Martin Michlmayr svn path=/dists/trunk/linux-2.6/; revision=13046 --- debian/config/alpha/config | 5 ----- debian/config/amd64/config | 5 ----- debian/config/arm/config.iop32x | 5 ----- debian/config/arm/config.ixp4xx | 5 ----- debian/config/arm/config.versatile | 5 ----- debian/config/config | 5 +++++ debian/config/i386/config | 5 ----- debian/config/mips/config.4kc-malta | 5 ----- debian/config/mips/config.5kc-malta | 5 ----- debian/config/mipsel/config.4kc-malta | 5 ----- debian/config/mipsel/config.5kc-malta | 5 ----- debian/config/powerpc/config | 5 ----- debian/config/sparc/config | 5 ----- 13 files changed, 5 insertions(+), 60 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index e83c1fbda..3f32b08c0 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1312,11 +1312,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index b53ae5ad2..33ff95b6b 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1517,11 +1517,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 294c490c1..4daf75d99 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -808,11 +808,6 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index ad0855ec3..82a54bfd9 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -873,11 +873,6 @@ CONFIG_IPX_INTERN=y ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 1afa939ff..c481fe197 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -508,11 +508,6 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/config b/debian/config/config index c04417666..6d4dff359 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2716,6 +2716,11 @@ CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +## +## file: net/llc/Kconfig +## +CONFIG_LLC2=m + ## ## file: net/mac80211/Kconfig ## diff --git a/debian/config/i386/config b/debian/config/i386/config index f6babe8c2..19529171b 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1777,11 +1777,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index f758e41e5..b39e133f1 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1596,11 +1596,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/netlabel/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 405a21e86..dd21daeea 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1901,11 +1901,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/netlabel/Kconfig ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 0f202305b..1ad883975 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1582,11 +1582,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/netlabel/Kconfig ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 92fa31df3..78a735ec4 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1900,11 +1900,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/netlabel/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2049e3b30..e8feb3c00 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -1031,11 +1031,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index b171902df..3a1eb4d9c 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -332,11 +332,6 @@ CONFIG_IPX=m ## # CONFIG_LAPB is not set -## -## file: net/llc/Kconfig -## -CONFIG_LLC2=m - ## ## file: net/wanrouter/Kconfig ##