From: Lennert Buytenhek Date: Wed, 11 Jan 2006 20:17:34 +0000 (-0800) Subject: [PATCH] cs89x0: fix setting of ALLOW_DMA X-Git-Tag: v2.6.16-rc1~406 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e1c46356beddf984ce0ce5ec4fbaea43a07ec8;p=linux-2.6 [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 907c010097..e2cfde7e31 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