diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-05-04 00:39:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:33:14 -0400 |
commit | 56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0 (patch) | |
tree | 881eb266d98dfe4502cb7338902af7c749a78553 /drivers/net/irda | |
parent | a553260618d88c4790daec7975c88f3db1080b5b (diff) |
[PATCH] ISA DMA Kconfig fixes - part 4 (irda)
* net/irda/irda_device.c::irda_setup_dma() made conditional on
ISA_DMA_API (it uses helpers in question and irda is usable on
platforms that don't have them at all - think of USB IRDA, for
example).
* irda drivers that depend on ISA DMA marked as dependent on
ISA_DMA_API
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 6bf76a444d48..1c553d7efdd9 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
@@ -310,7 +310,7 @@ config SIGMATEL_FIR | |||
310 | 310 | ||
311 | config NSC_FIR | 311 | config NSC_FIR |
312 | tristate "NSC PC87108/PC87338" | 312 | tristate "NSC PC87108/PC87338" |
313 | depends on IRDA | 313 | depends on IRDA && ISA_DMA_API |
314 | help | 314 | help |
315 | Say Y here if you want to build support for the NSC PC87108 and | 315 | Say Y here if you want to build support for the NSC PC87108 and |
316 | PC87338 IrDA chipsets. This driver supports SIR, | 316 | PC87338 IrDA chipsets. This driver supports SIR, |
@@ -321,7 +321,7 @@ config NSC_FIR | |||
321 | 321 | ||
322 | config WINBOND_FIR | 322 | config WINBOND_FIR |
323 | tristate "Winbond W83977AF (IR)" | 323 | tristate "Winbond W83977AF (IR)" |
324 | depends on IRDA | 324 | depends on IRDA && ISA_DMA_API |
325 | help | 325 | help |
326 | Say Y here if you want to build IrDA support for the Winbond | 326 | Say Y here if you want to build IrDA support for the Winbond |
327 | W83977AF super-io chipset. This driver should be used for the IrDA | 327 | W83977AF super-io chipset. This driver should be used for the IrDA |
@@ -347,7 +347,7 @@ config AU1000_FIR | |||
347 | 347 | ||
348 | config SMC_IRCC_FIR | 348 | config SMC_IRCC_FIR |
349 | tristate "SMSC IrCC (EXPERIMENTAL)" | 349 | tristate "SMSC IrCC (EXPERIMENTAL)" |
350 | depends on EXPERIMENTAL && IRDA | 350 | depends on EXPERIMENTAL && IRDA && ISA_DMA_API |
351 | help | 351 | help |
352 | Say Y here if you want to build support for the SMC Infrared | 352 | Say Y here if you want to build support for the SMC Infrared |
353 | Communications Controller. It is used in a wide variety of | 353 | Communications Controller. It is used in a wide variety of |
@@ -357,7 +357,7 @@ config SMC_IRCC_FIR | |||
357 | 357 | ||
358 | config ALI_FIR | 358 | config ALI_FIR |
359 | tristate "ALi M5123 FIR (EXPERIMENTAL)" | 359 | tristate "ALi M5123 FIR (EXPERIMENTAL)" |
360 | depends on EXPERIMENTAL && IRDA | 360 | depends on EXPERIMENTAL && IRDA && ISA_DMA_API |
361 | help | 361 | help |
362 | Say Y here if you want to build support for the ALi M5123 FIR | 362 | Say Y here if you want to build support for the ALi M5123 FIR |
363 | Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C, | 363 | Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C, |
@@ -385,7 +385,7 @@ config SA1100_FIR | |||
385 | 385 | ||
386 | config VIA_FIR | 386 | config VIA_FIR |
387 | tristate "VIA VT8231/VT1211 SIR/MIR/FIR" | 387 | tristate "VIA VT8231/VT1211 SIR/MIR/FIR" |
388 | depends on IRDA | 388 | depends on IRDA && ISA_DMA_API |
389 | help | 389 | help |
390 | Say Y here if you want to build support for the VIA VT8231 | 390 | Say Y here if you want to build support for the VIA VT8231 |
391 | and VIA VT1211 IrDA controllers, found on the motherboards using | 391 | and VIA VT1211 IrDA controllers, found on the motherboards using |