From cd317fccca0db8151f5c9e8ac24f8087145194b9 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sun, 22 Feb 2009 19:57:48 +0000 Subject: [PATCH] disable NET_DSA in topconfig since this hardware is special purpose and cannot be compiled as a module. svn path=/dists/trunk/linux-2.6/; revision=12928 --- debian/changelog | 5 +++-- debian/config/arm/config.iop32x | 3 --- debian/config/arm/config.ixp4xx | 3 --- debian/config/config | 5 +---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 495b7b409..a7057e54d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,9 @@ linux-2.6 (2.6.29~rc5-1~experimental.1) UNRELEASED; urgency=low * [arm/versatile, arm/iop32x, arm/ixp4xx] Make LLC2 modular. * [arm, mips, mipsel] Make MII modular. * [arm/ixp4xx] Make IXP4XX_WATCHDOG modular. - * [arm/iop32x, arm/ixp4xx] Unset NET_DSA since it bloats the kernel - image too much and cannot be made modular at the moment. + * topconfig: NET_DSA since this hardware is special purpose and the + option cannot be made modular at the moment and bloats the kernel + image too much. -- maximilian attems Thu, 19 Feb 2009 13:25:20 +0100 diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index bd8f754b6..2d33587f7 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -906,6 +906,3 @@ CONFIG_SND_RIPTIDE=m # CONFIG_DEBUG_KERNEL is not set -# Cannot be made modular at the moment and just bloats the kernel -# CONFIG_NET_DSA is not set - diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 526ed75d7..ad0855ec3 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -957,6 +957,3 @@ CONFIG_SND_PCXHR=m # CONFIG_DEBUG_KERNEL is not set -# Cannot be made modular at the moment and just bloats the kernel -# CONFIG_NET_DSA is not set - diff --git a/debian/config/config b/debian/config/config index 43577cfdd..2bded41b9 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2494,10 +2494,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100 ## ## file: net/dsa/Kconfig ## -CONFIG_NET_DSA=y -CONFIG_NET_DSA_MV88E6060=y -CONFIG_NET_DSA_MV88E6131=y -CONFIG_NET_DSA_MV88E6123_61_65=y +# CONFIG_NET_DSA is not set ## ## file: net/ieee80211/Kconfig