diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 05:41:54 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 05:41:54 (GMT) |
commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /drivers/remoteproc | |
parent | a10d60c08cc3bbea9195e2b36440f557373623eb (diff) | |
parent | 0bdb3ccd02509a4380d54efd85effc6a9902d4fd (diff) | |
download | linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r-- | drivers/remoteproc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index ce1743d..5e343ba 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -44,7 +44,7 @@ config STE_MODEM_RPROC config DA8XX_REMOTEPROC tristate "DA8xx/OMAP-L13x remoteproc support" depends on ARCH_DAVINCI_DA8XX - select CMA + select CMA if MMU select REMOTEPROC select RPMSG help |