From 59c55bdde856c4000bbeb33ba212c3df6f1997a4 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 20 Apr 2012 10:56:16 +0000 Subject: 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 Signed-off-by: Mathieu Poirier Signed-off-by: David S. Miller --- drivers/net/tokenring/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/net/tokenring/Kconfig') diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index 45550d42b36..ef3bb1326e4 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -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. -- cgit v1.2.3-70-g09d2