- 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
This commit is contained in:
Arnaud Patard 2011-06-27 11:47:00 +00:00
parent 5e9e127a05
commit 888ce913dc
8 changed files with 8 additions and 30 deletions

6
debian/changelog vendored
View File

@ -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 <maks@debian.org> Tue, 21 Jun 2011 15:00:23 +0200
linux-2.6 (3.0.0~rc4-1~experimental.1) experimental; urgency=low

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,7 +1,6 @@
[base]
flavours:
iop32x
ixp4xx
kirkwood
orion5x
versatile

View File

@ -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