diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 15:22:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 15:22:39 +1100 |
| commit | 476dd646c57120b629b81482234f44b1f2eb7e1d (patch) | |
| tree | 05c5f46a3a72274d99e2d61b9d5a9df6d8d41a97 /drivers/dma | |
| parent | b6323a7928f9ba0cfb3a994505aee07173cddee5 (diff) | |
| parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Diffstat (limited to 'drivers/dma')
| -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 c61a6eccf169..dd2874ec1927 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -313,7 +313,7 @@ config MMP_PDMA depends on (ARCH_MMP || ARCH_PXA) select DMA_ENGINE help - Support the MMP PDMA engine for PXA and MMP platfrom. + Support the MMP PDMA engine for PXA and MMP platform. config DMA_JZ4740 tristate "JZ4740 DMA support" |