Commit 59c55bdd authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a22d5d5

drivers/net/tokenring/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ config 3C359 




config TMS380TR

config TMS380TR

	tristate "Generic TMS380 Token Ring ISA/PCI adapter support"

	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

	select FW_LOADER

	---help---

	---help---

	  This driver provides generic support for token ring adapters

	  This driver provides generic support for token ring adapters
@@ -137,7 +137,7 @@ config TMSPCI 




config SKISA

config SKISA

	tristate "SysKonnect TR4/16 ISA support"

	tristate "SysKonnect TR4/16 ISA support"

	depends on TMS380TR && ISA

	depends on TMS380TR && ISA && ISA_DMA_API

	help

	help

	  This tms380 module supports SysKonnect TR4/16 ISA cards.

	  This tms380 module supports SysKonnect TR4/16 ISA cards.
@@ -149,7 +149,7 @@ config SKISA 




config PROTEON

config PROTEON

	tristate "Proteon ISA support"

	tristate "Proteon ISA support"

	depends on TMS380TR && ISA

	depends on TMS380TR && ISA && ISA_DMA_API

	help

	help

	  This tms380 module supports Proteon ISA cards.

	  This tms380 module supports Proteon ISA cards.

drivers/net/tokenring/tms380tr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ int tms380tr_open(struct net_device *dev) 




	/* Reset the hardware here. Don't forget to set the station address. */

	/* 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) 

	if(dev->dma > 0) 

	{

	{

		unsigned long flags=claim_dma_lock();

		unsigned long flags=claim_dma_lock();
@@ -1126,7 +1126,7 @@ int tms380tr_close(struct net_device *dev) 
	del_timer(&tp->timer);

	del_timer(&tp->timer);

	tms380tr_disable_interrupts(dev);

	tms380tr_disable_interrupts(dev);





#ifdef CONFIG_ISA

#if defined(CONFIG_ISA) && defined(CONFIG_ISA_DMA_API)

	if(dev->dma > 0) 

	if(dev->dma > 0) 

	{

	{

		unsigned long flags=claim_dma_lock();

		unsigned long flags=claim_dma_lock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE