[kernel] r17734 - in dists/trunk/linux-2.6/debian: . config/armel config/armhf
Arnaud Patard
rtp-guest at alioth.debian.org
Mon Jun 27 11:47:01 UTC 2011
Author: rtp-guest
Date: Mon Jun 27 11:47:00 2011
New Revision: 17734
Log:
- 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
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/armel/config.iop32x
dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/config/armel/config.orion5x
dists/trunk/linux-2.6/debian/config/armel/config.versatile
dists/trunk/linux-2.6/debian/config/armel/defines
dists/trunk/linux-2.6/debian/config/armhf/config.mx5
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/changelog Mon Jun 27 11:47:00 2011 (r17734)
@@ -4,6 +4,12 @@
* [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 at debian.org> Tue, 21 Jun 2011 15:00:23 +0200
linux-2.6 (3.0.0~rc4-1~experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Mon Jun 27 11:47:00 2011 (r17734)
@@ -712,9 +712,4 @@
##
# CONFIG_SND_HDA_INTEL is not set
-##
-## file: unknown
-##
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_LH7A40X is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Mon Jun 27 11:47:00 2011 (r17734)
@@ -791,9 +791,4 @@
##
# CONFIG_SND_HDA_INTEL is not set
-##
-## file: unknown
-##
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_LH7A40X is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Mon Jun 27 11:47:00 2011 (r17734)
@@ -639,10 +639,3 @@
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
-
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Mon Jun 27 11:47:00 2011 (r17734)
@@ -585,10 +585,4 @@
##
CONFIG_WAN_ROUTER=m
-##
-## file: unknown
-##
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_NS9XXX is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Mon Jun 27 11:47:00 2011 (r17734)
@@ -437,10 +437,4 @@
##
# 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
Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armel/defines Mon Jun 27 11:47:00 2011 (r17734)
@@ -1,7 +1,6 @@
[base]
flavours:
iop32x
- ixp4xx
kirkwood
orion5x
versatile
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Sun Jun 26 21:29:53 2011 (r17733)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Mon Jun 27 11:47:00 2011 (r17734)
@@ -31,6 +31,8 @@
##
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
##
## file: drivers/gpio/Kconfig
More information about the Kernel-svn-changes
mailing list