diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:42:29 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:42:29 -0400 |
| commit | f9dd2134374c8de6b911e2b8652c6c9622eaa658 (patch) | |
| tree | c1b8f8d622941606b9e7247ab31d811ba4295011 /drivers/dma/Kconfig | |
| parent | 4b652f0db3be891c7b76b109c3b55003b920fc96 (diff) | |
| parent | 07a3b417dc3d00802bd7b4874c3e811f0b015a7d (diff) | |
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts:
include/linux/dmaengine.h
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 3b3c01b6f1ee..912a51b5cbd3 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | menuconfig DMADEVICES | 5 | menuconfig DMADEVICES |
| 6 | bool "DMA Engine support" | 6 | bool "DMA Engine support" |
| 7 | depends on !HIGHMEM64G && HAS_DMA | 7 | depends on HAS_DMA |
| 8 | help | 8 | help |
| 9 | DMA engines can do asynchronous data transfers without | 9 | DMA engines can do asynchronous data transfers without |
| 10 | involving the host CPU. Currently, this framework can be | 10 | involving the host CPU. Currently, this framework can be |