git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
dma
/
Kconfig
diff --git
a/drivers/dma/Kconfig
b/drivers/dma/Kconfig
index
c61a6ec
..
dd2874e
100644
(file)
--- 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 platf
ro
m.
+ Support the MMP PDMA engine for PXA and MMP platf
or
m.
config DMA_JZ4740
tristate "JZ4740 DMA support"