aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-20 06:56:16 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-21 15:28:48 -0400
commit59c55bdde856c4000bbeb33ba212c3df6f1997a4 (patch)
tree5e4437df10fb9e5f4ed5392b360432b325b73781 /drivers/net/tokenring/Kconfig
parent3a22d5d5eb7bb0e521f3a0e76d20747cc7fb6798 (diff)
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/Kconfig')
-rw-r--r--drivers/net/tokenring/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 45550d42b368..ef3bb1326e4f 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -98,7 +98,7 @@ config 3C359
98 98
99config TMS380TR 99config TMS380TR
100 tristate "Generic TMS380 Token Ring ISA/PCI adapter support" 100 tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
101 depends on PCI || ISA && ISA_DMA_API || MCA 101 depends on PCI || ISA || MCA
102 select FW_LOADER 102 select FW_LOADER
103 ---help--- 103 ---help---
104 This driver provides generic support for token ring adapters 104 This driver provides generic support for token ring adapters
@@ -137,7 +137,7 @@ config TMSPCI
137 137
138config SKISA 138config SKISA
139 tristate "SysKonnect TR4/16 ISA support" 139 tristate "SysKonnect TR4/16 ISA support"
140 depends on TMS380TR && ISA 140 depends on TMS380TR && ISA && ISA_DMA_API
141 help 141 help
142 This tms380 module supports SysKonnect TR4/16 ISA cards. 142 This tms380 module supports SysKonnect TR4/16 ISA cards.
143 143
@@ -149,7 +149,7 @@ config SKISA
149 149
150config PROTEON 150config PROTEON
151 tristate "Proteon ISA support" 151 tristate "Proteon ISA support"
152 depends on TMS380TR && ISA 152 depends on TMS380TR && ISA && ISA_DMA_API
153 help 153 help
154 This tms380 module supports Proteon ISA cards. 154 This tms380 module supports Proteon ISA cards.
155 155