From 888ce913dc58373a5b06abc81598d20ec49d939c Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Mon, 27 Jun 2011 11:47:00 +0000 Subject: [PATCH] - remove config entries which have been killed upstream - _temporarily_ disable ixp due to build failure. Hopefully, there'll be something in -final - disable not-working net_dma on mx5 svn path=/dists/trunk/linux-2.6/; revision=17734 --- debian/changelog | 6 ++++++ debian/config/armel/config.iop32x | 5 ----- debian/config/armel/config.ixp4xx | 5 ----- debian/config/armel/config.kirkwood | 7 ------- debian/config/armel/config.orion5x | 6 ------ debian/config/armel/config.versatile | 6 ------ debian/config/armel/defines | 1 - debian/config/armhf/config.mx5 | 2 ++ 8 files changed, 8 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0f5896a4..68dd09bb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ linux-2.6 (3.0.0~rc4-1~experimental.2) UNRELEASED; urgency=low * [x86] enable some comedi modules. (closes: #631199) * [kirkwood] Enable sound support for the HP t5325 (closes: #631762) + [ Arnaud Patard ] + * [armel] disable ixp4xx, until upstream agrees on how to fix + the build error + * [armel] Remove configuration options which don't exist anymore + * [armhf] disable net dma/async tx on mx5 as it can't work + -- maximilian attems Tue, 21 Jun 2011 15:00:23 +0200 linux-2.6 (3.0.0~rc4-1~experimental.1) experimental; urgency=low diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 1e999cae3..137004681 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -712,9 +712,4 @@ CONFIG_SND_RIPTIDE=m ## # CONFIG_SND_HDA_INTEL is not set -## -## file: unknown -## -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_LH7A40X is not set diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 28ba098fc..2aa1840a5 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -791,9 +791,4 @@ CONFIG_SND_PCXHR=m ## # CONFIG_SND_HDA_INTEL is not set -## -## file: unknown -## -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_LH7A40X is not set diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 3e0c83f21..bda2fe70a 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -639,10 +639,3 @@ CONFIG_SND_KIRKWOOD_SOC=m CONFIG_SND_KIRKWOOD_SOC_OPENRD=m CONFIG_SND_KIRKWOOD_SOC_T5325=m -## -## file: unknown -## -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_NS9XXX is not set - diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index e6084b80c..3fc6b2766 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -585,10 +585,4 @@ CONFIG_ROSE=m ## CONFIG_WAN_ROUTER=m -## -## file: unknown -## -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_NS9XXX is not set diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 4a04b0bea..c91a1fe4a 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -437,10 +437,4 @@ CONFIG_IPX_INTERN=y ## # CONFIG_WAN_ROUTER is not set -## -## file: unknown -## -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_NS9XXX is not set diff --git a/debian/config/armel/defines b/debian/config/armel/defines index 804b79f28..a7687a541 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -1,7 +1,6 @@ [base] flavours: iop32x - ixp4xx kirkwood orion5x versatile diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5 index 863c7d050..bcb3e3cb1 100644 --- a/debian/config/armhf/config.mx5 +++ b/debian/config/armhf/config.mx5 @@ -31,6 +31,8 @@ CONFIG_MXC_PWM=y ## CONFIG_DMADEVICES=y CONFIG_IMX_SDMA=y +# CONFIG_NET_DMA is not set +# CONFIG_ASYNC_TX_DMA is not set ## ## file: drivers/gpio/Kconfig