summaryrefslogtreecommitdiff
path: root/drivers/net/cs89x0.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-11 12:17:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 18:42:11 -0800
commit91e1c46356beddf984ce0ce5ec4fbaea43a07ec8 (patch)
tree2f9a67e020936687e87bc351002a8af7263abcf9 /drivers/net/cs89x0.c
parent4ab2495a30bb3de1cfe41a886f83afb68616ab7d (diff)
downloadlinux-3.10-91e1c46356beddf984ce0ce5ec4fbaea43a07ec8.tar.gz
linux-3.10-91e1c46356beddf984ce0ce5ec4fbaea43a07ec8.tar.bz2
linux-3.10-91e1c46356beddf984ce0ce5ec4fbaea43a07ec8.zip
[PATCH] cs89x0: fix setting of ALLOW_DMA
There's an ifdef in cs89x0.c that seems to have been the wrong way round since it was merged (and noone seems to have noticed) -- the IXDP2x01 doesn't support ISA-style DMA, but when building for IXDP2x01, cs89x0's ALLOW_DMA is set to 1, and when building for another platform, ALLOW_DMA is set to 0. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/cs89x0.c')
-rw-r--r--drivers/net/cs89x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 907c0100974..e2cfde7e31e 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -100,7 +100,7 @@
* Note that even if DMA is turned off we still support the 'dma' and 'use_dma'
* module options so we don't break any startup scripts.
*/
-#ifndef CONFIG_ARCH_IXDP2X01
+#ifndef CONFIG_ISA_DMA_API
#define ALLOW_DMA 0
#else
#define ALLOW_DMA 1