diff options
author | Olof Johansson <olof@lixom.net> | 2013-07-22 19:50:11 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-07-22 19:54:21 -0700 |
commit | cc23ee49d36fe5ce1435f75e5312bee9d76010c2 (patch) | |
tree | 0d8eeffb1d0a93316d8027c0d2c838145080623c /arch/h8300 | |
parent | dmaengine: shdma: fix a build failure on platforms with no DMA support (diff) | |
parent | ARM: davinci: defconfig: enable EDMA driver (diff) | |
download | linux-dev-cc23ee49d36fe5ce1435f75e5312bee9d76010c2.tar.xz linux-dev-cc23ee49d36fe5ce1435f75e5312bee9d76010c2.zip |
Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
From Sekhar Nori:
DaVinci fixes for v3.11-rc2
The pull request includes fixes for sparse warnings, defconfig changes to
enable DMA usage on peripherals and removal of a duplicated include file.
* tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: defconfig: enable EDMA driver
ARM: davinci: make file local variables static
ARM: edma: remove duplicated include from edma.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/h8300')
0 files changed, 0 insertions, 0 deletions