diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /drivers/dma/Kconfig | |
| parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index bc8fb41cd62..81e1020fb51 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -89,6 +89,14 @@ config MX3_IPU_IRQS | |||
| 89 | To avoid bloating the irq_desc[] array we allocate a sufficient | 89 | To avoid bloating the irq_desc[] array we allocate a sufficient |
| 90 | number of IRQ slots and map them dynamically to specific sources. | 90 | number of IRQ slots and map them dynamically to specific sources. |
| 91 | 91 | ||
| 92 | config TXX9_DMAC | ||
| 93 | tristate "Toshiba TXx9 SoC DMA support" | ||
| 94 | depends on MACH_TX49XX || MACH_TX39XX | ||
| 95 | select DMA_ENGINE | ||
| 96 | help | ||
| 97 | Support the TXx9 SoC internal DMA controller. This can be | ||
| 98 | integrated in chips such as the Toshiba TX4927/38/39. | ||
| 99 | |||
| 92 | config DMA_ENGINE | 100 | config DMA_ENGINE |
| 93 | bool | 101 | bool |
| 94 | 102 | ||