diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-20 12:56:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-21 21:28:48 +0200 |
| commit | 59c55bdde856c4000bbeb33ba212c3df6f1997a4 (patch) | |
| tree | 5e4437df10fb9e5f4ed5392b360432b325b73781 /drivers/net/tokenring/tms380tr.c | |
| parent | sungem: use mdelay instead of udelay where necessary (diff) | |
| download | linux-59c55bdde856c4000bbeb33ba212c3df6f1997a4.tar.xz linux-59c55bdde856c4000bbeb33ba212c3df6f1997a4.zip | |
drivers/net: decouple ISA and ISA_DMA_API
The two options are separate, and some platforms (e.g. arm pxa)
have ISA slots but no ISA dma controller, so they cannot build
drivers using the DMA API functions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring/tms380tr.c')
| -rw-r--r-- | drivers/net/tokenring/tms380tr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index be4813e0366c..b5e0855e4b39 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c @@ -254,7 +254,7 @@ int tms380tr_open(struct net_device *dev) /* Reset the hardware here. Don't forget to set the station address. */ -#ifdef CONFIG_ISA +#if defined(CONFIG_ISA) && defined(CONFIG_ISA_DMA_API) if(dev->dma > 0) { unsigned long flags=claim_dma_lock(); @@ -1125,8 +1125,8 @@ int tms380tr_close(struct net_device *dev) del_timer(&tp->timer); tms380tr_disable_interrupts(dev); - -#ifdef CONFIG_ISA + +#if defined(CONFIG_ISA) && defined(CONFIG_ISA_DMA_API) if(dev->dma > 0) { unsigned long flags=claim_dma_lock(); |