diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-01-11 15:17:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:11 -0500 |
| commit | 91e1c46356beddf984ce0ce5ec4fbaea43a07ec8 (patch) | |
| tree | 2f9a67e020936687e87bc351002a8af7263abcf9 /drivers/net | |
| parent | 4ab2495a30bb3de1cfe41a886f83afb68616ab7d (diff) | |
[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')
| -rw-r--r-- | drivers/net/cs89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 907c01009746..e2cfde7e31ec 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -100,7 +100,7 @@ | |||
| 100 | * Note that even if DMA is turned off we still support the 'dma' and 'use_dma' | 100 | * Note that even if DMA is turned off we still support the 'dma' and 'use_dma' |
| 101 | * module options so we don't break any startup scripts. | 101 | * module options so we don't break any startup scripts. |
| 102 | */ | 102 | */ |
| 103 | #ifndef CONFIG_ARCH_IXDP2X01 | 103 | #ifndef CONFIG_ISA_DMA_API |
| 104 | #define ALLOW_DMA 0 | 104 | #define ALLOW_DMA 0 |
| 105 | #else | 105 | #else |
| 106 | #define ALLOW_DMA 1 | 106 | #define ALLOW_DMA 1 |