OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2012-04-20 10:56:16 +00:00 committed by David S. Miller
parent 3a22d5d5eb
commit 59c55bdde8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/tokenring/Kconfig
View File

@ -98,7 +98,7 @@ config 3C359
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on PCI || ISA && ISA_DMA_API || MCA
depends on PCI || ISA || MCA
select FW_LOADER
---help---
This driver provides generic support for token ring adapters
@ -137,7 +137,7 @@ config TMSPCI
config SKISA
tristate "SysKonnect TR4/16 ISA support"
depends on TMS380TR && ISA
depends on TMS380TR && ISA && ISA_DMA_API
help
This tms380 module supports SysKonnect TR4/16 ISA cards.
@ -149,7 +149,7 @@ config SKISA
config PROTEON
tristate "Proteon ISA support"
depends on TMS380TR && ISA
depends on TMS380TR && ISA && ISA_DMA_API
help
This tms380 module supports Proteon ISA cards.

6
drivers/net/tokenring/tms380tr.c
View File

@ -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();