summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-05-04 05:39:52 +0100
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:33:14 -0700
commit56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0 (patch)
tree881eb266d98dfe4502cb7338902af7c749a78553 /net
parenta553260618d88c4790daec7975c88f3db1080b5b (diff)
downloadlinux-3.10-56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0.tar.gz
linux-3.10-56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0.tar.bz2
linux-3.10-56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0.zip
[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 'net')
-rw-r--r--net/irda/irda_device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index d6ccd3239dc..70543d89438 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -470,6 +470,7 @@ void irda_device_unregister_dongle(struct dongle_reg *dongle)
}
EXPORT_SYMBOL(irda_device_unregister_dongle);
+#ifdef CONFIG_ISA_DMA_API
/*
* Function setup_dma (idev, buffer, count, mode)
*
@@ -492,3 +493,4 @@ void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode)
release_dma_lock(flags);
}
EXPORT_SYMBOL(irda_setup_dma);
+#endif