diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 15:35:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 15:35:09 -0400 |
| commit | 0edcd16a4def296bd6492ae0c10a3c4aef9ef7c0 (patch) | |
| tree | 9d46123ddc7e42ce573bc05701fdfa5cd15b497e /include | |
| parent | d4d1cda6ef48a99dee5c0f3334a556845e84dd92 (diff) | |
| parent | 95cee62cb4776a65229a6b6d5969be56589d95c1 (diff) | |
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')
| -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); | |||
| 50 | 50 | ||
| 51 | #else | 51 | #else |
| 52 | 52 | ||
| 53 | void __init omap_rproc_reserve_cma(void) | 53 | static inline void __init omap_rproc_reserve_cma(void) |
| 54 | { | 54 | { |
| 55 | } | 55 | } |
| 56 | 56 | ||