aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2008-06-27 04:21:11 -0400
committerDan Williams <dan.j.williams@intel.com>2008-07-08 14:58:12 -0400
commit9c402f4e196290692d998b188f9094deb1619e57 (patch)
treed61209d265890e20d8d2933e88fb58c8075454ac /drivers
parent1099dc79245719c046e632212ec09d6ec1154ef5 (diff)
dmaengine: remove arch dependency from DMADEVICES
The dependency is redundant since all drivers set their specific arch dependencies. The NET_DMA option is modified to be enabled only on platforms where it is known to have a positive effect. HAS_DMA is added as an explicit dependency for the DMADEVICES menu. Acked-by: Adrian Bunk <bunk@kernel.org> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/Kconfig13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 6239c3df30ac..e4dd0065da33 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -4,13 +4,14 @@
4 4
5menuconfig DMADEVICES 5menuconfig DMADEVICES
6 bool "DMA Engine support" 6 bool "DMA Engine support"
7 depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX || PPC 7 depends on !HIGHMEM64G && HAS_DMA
8 depends on !HIGHMEM64G
9 help 8 help
10 DMA engines can do asynchronous data transfers without 9 DMA engines can do asynchronous data transfers without
11 involving the host CPU. Currently, this framework can be 10 involving the host CPU. Currently, this framework can be
12 used to offload memory copies in the network stack and 11 used to offload memory copies in the network stack and
13 RAID operations in the MD driver. 12 RAID operations in the MD driver. This menu only presents
13 DMA Device drivers supported by the configured arch, it may
14 be empty in some cases.
14 15
15if DMADEVICES 16if DMADEVICES
16 17
@@ -55,10 +56,12 @@ comment "DMA Clients"
55config NET_DMA 56config NET_DMA
56 bool "Network: TCP receive copy offload" 57 bool "Network: TCP receive copy offload"
57 depends on DMA_ENGINE && NET 58 depends on DMA_ENGINE && NET
59 default (INTEL_IOATDMA || FSL_DMA)
58 help 60 help
59 This enables the use of DMA engines in the network stack to 61 This enables the use of DMA engines in the network stack to
60 offload receive copy-to-user operations, freeing CPU cycles. 62 offload receive copy-to-user operations, freeing CPU cycles.
61 Since this is the main user of the DMA engine, it should be enabled; 63
62 say Y here. 64 Say Y here if you enabled INTEL_IOATDMA or FSL_DMA, otherwise
65 say N.
63 66
64endif 67endif