Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0

Authored by Al Viro
Committed by Linus Torvalds
1 parent a553260618
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[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>

Showing 2 changed files with 7 additions and 5 deletions Side-by-side Diff

drivers/net/irda/Kconfig
Diff comments   View file @ 56c3b7d
... ... @@ -310,7 +310,7 @@
310 310  
311 311 config NSC_FIR
312 312 tristate "NSC PC87108/PC87338"
313   - depends on IRDA
  313 + depends on IRDA && ISA_DMA_API
314 314 help
315 315 Say Y here if you want to build support for the NSC PC87108 and
316 316 PC87338 IrDA chipsets. This driver supports SIR,
... ... @@ -321,7 +321,7 @@
321 321  
322 322 config WINBOND_FIR
323 323 tristate "Winbond W83977AF (IR)"
324   - depends on IRDA
  324 + depends on IRDA && ISA_DMA_API
325 325 help
326 326 Say Y here if you want to build IrDA support for the Winbond
327 327 W83977AF super-io chipset. This driver should be used for the IrDA
... ... @@ -347,7 +347,7 @@
347 347  
348 348 config SMC_IRCC_FIR
349 349 tristate "SMSC IrCC (EXPERIMENTAL)"
350   - depends on EXPERIMENTAL && IRDA
  350 + depends on EXPERIMENTAL && IRDA && ISA_DMA_API
351 351 help
352 352 Say Y here if you want to build support for the SMC Infrared
353 353 Communications Controller. It is used in a wide variety of
... ... @@ -357,7 +357,7 @@
357 357  
358 358 config ALI_FIR
359 359 tristate "ALi M5123 FIR (EXPERIMENTAL)"
360   - depends on EXPERIMENTAL && IRDA
  360 + depends on EXPERIMENTAL && IRDA && ISA_DMA_API
361 361 help
362 362 Say Y here if you want to build support for the ALi M5123 FIR
363 363 Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C,
... ... @@ -385,7 +385,7 @@
385 385  
386 386 config VIA_FIR
387 387 tristate "VIA VT8231/VT1211 SIR/MIR/FIR"
388   - depends on IRDA
  388 + depends on IRDA && ISA_DMA_API
389 389 help
390 390 Say Y here if you want to build support for the VIA VT8231
391 391 and VIA VT1211 IrDA controllers, found on the motherboards using
net/irda/irda_device.c
Diff comments   View file @ 56c3b7d
... ... @@ -470,6 +470,7 @@
470 470 }
471 471 EXPORT_SYMBOL(irda_device_unregister_dongle);
472 472  
  473 +#ifdef CONFIG_ISA_DMA_API
473 474 /*
474 475 * Function setup_dma (idev, buffer, count, mode)
475 476 *
... ... @@ -492,4 +493,5 @@
492 493 release_dma_lock(flags);
493 494 }
494 495 EXPORT_SYMBOL(irda_setup_dma);
  496 +#endif