[kernel] r10146 - in dists/trunk/linux-2.6/debian: . config/arm

[Martin Michlmayr]

Author: tbm
Date: Sat Jan 19 18:26:42 2008
New Revision: 10146

Log:
[arm/iop32x] Activate DMADEVICES.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.iop32x

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jan 19 18:26:42 2008
@@ -2,6 +2,7 @@
 
   [ Martin Michlmayr ]
   * Don't build the AdvanSys driver on ARM since it fails to compile.
+  * [arm/iop32x] Activate DMADEVICES.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sat, 19 Jan 2008 19:23:50 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Sat Jan 19 18:26:42 2008
@@ -1143,18 +1143,18 @@
 #
 # DMA Engine support
 #
-CONFIG_DMA_ENGINE=y
+CONFIG_DMADEVICES=y
 
 #
-# DMA Clients
+# DMA Devices
 #
-CONFIG_NET_DMA=y
+CONFIG_INTEL_IOP_ADMA=y
+CONFIG_DMA_ENGINE=y
 
 #
-# DMA Devices
+# DMA Clients
 #
-CONFIG_INTEL_IOATDMA=y
-CONFIG_INTEL_IOP_ADMA=y
+CONFIG_NET_DMA=y
 
 #
 # Miscellaneous filesystems