diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 12:35:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 12:35:09 -0700 |
| commit | 0edcd16a4def296bd6492ae0c10a3c4aef9ef7c0 (patch) | |
| tree | 9d46123ddc7e42ce573bc05701fdfa5cd15b497e /include/linux | |
| parent | Merge tag 'xtensa-next-20130710' of git://github.com/czankel/xtensa-linux (diff) | |
| parent | remoteproc: Cocci spatch "memdup.spatch" (diff) | |
| download | linux-dev-0edcd16a4def296bd6492ae0c10a3c4aef9ef7c0.tar.xz linux-dev-0edcd16a4def296bd6492ae0c10a3c4aef9ef7c0.zip | |
Merge tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc fixes from Ohad Ben-Cohen:
"Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer"
* tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
remoteproc: Cocci spatch "memdup.spatch"
remoteproc: free carveout memories only after unmapping them
remoteproc/omap: fix a sparse warning
remoteproc: fix checkpatch errors in remoteproc code
remoteproc: fix error return code in rproc_fw_boot()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/remoteproc-omap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/remoteproc-omap.h b/include/linux/platform_data/remoteproc-omap.h index 3c1c6444ec4b..bfbd12b41162 100644 --- a/include/linux/platform_data/remoteproc-omap.h +++ b/include/linux/platform_data/remoteproc-omap.h @@ -50,7 +50,7 @@ void __init omap_rproc_reserve_cma(void); #else -void __init omap_rproc_reserve_cma(void) +static inline void __init omap_rproc_reserve_cma(void) { } |