diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-13 09:50:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-13 09:50:45 -0400 |
| commit | a94ab561e2f49a80d8579930e840b810ab1a1330 (patch) | |
| tree | 77913e7bd9309afa6b2ddc6f3e3e49827da2025c /include/tee/optee.h | |
| parent | 3b676a1662ac6b54d1e97ea40a0c41ee0925ffe3 (diff) | |
| parent | 8c4e3b79bd0bb76eea16869e9666e19047c0d005 (diff) | |
Merge branch '2021-04-13-assorted-improvements'
- A large assortment of bug fixes, code cleanups and a few feature
enhancements.
Diffstat (limited to 'include/tee/optee.h')
| -rw-r--r-- | include/tee/optee.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tee/optee.h b/include/tee/optee.h index affa937da0..ebdfe5e98d 100644 --- a/include/tee/optee.h +++ b/include/tee/optee.h @@ -71,9 +71,9 @@ static inline int optee_verify_bootm_image(unsigned long image_addr, #endif #if defined(CONFIG_OPTEE) && defined(CONFIG_OF_LIBFDT) -int optee_copy_fdt_nodes(const void *old_blob, void *new_blob); +int optee_copy_fdt_nodes(void *new_blob); #else -static inline int optee_copy_fdt_nodes(const void *old_blob, void *new_blob) +static inline int optee_copy_fdt_nodes(void *new_blob) { return 0; } |