From a7ec96ea20b5a0f4e948ee7abec4ecfb61f37060 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Thu, 3 Jul 2008 09:49:17 +0000
Subject: [PATCH] Unset NET_DMA since it actually leads to worse network
 performance on IOP; see
 http://groups.google.com/group/linux.kernel/msg/ea6159b2e0e2759e

svn path=/dists/trunk/linux-2.6/; revision=11746
---
 debian/changelog                | 2 ++
 debian/config/arm/config.iop32x | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f52eb8ebf..f3c7be014 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low
     - gbefb: fix cmap FIFO timeout (closes: #487257)
   * [arm/ixp4xx] Add support for Freecom FSG-3 (Rod Whitby).
   * [arm/ixp4xx] Enable CONFIG_MACH_DSMG600.
+  * [arm/iop32x] Unset NET_DMA since it actually leads to worse network
+    performance.
 
   [ Ian Campbell ]
   * Readme.build updated on how to generate orig tarballs.
diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x
index 9269836e4..b8f95f31e 100644
--- a/debian/config/arm/config.iop32x
+++ b/debian/config/arm/config.iop32x
@@ -144,7 +144,7 @@ CONFIG_VT_CONSOLE=y
 ##
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOP_ADMA=y
-CONFIG_NET_DMA=y
+# CONFIG_NET_DMA is not set
 
 ##
 ## file: drivers/firewire/Kconfig