diff options
author | 2016-07-19 11:02:56 -0700 | |
---|---|---|
committer | 2016-07-19 11:02:56 -0700 | |
commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /lib/mpi/mpi-inline.h | |
parent | Input: pixcir_ts - add support for axis inversion / swapping (diff) | |
parent | Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle (diff) | |
download | wireguard-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz wireguard-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.zip |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'lib/mpi/mpi-inline.h')
-rw-r--r-- | lib/mpi/mpi-inline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h index e2b39852b30a..c245ea31f785 100644 --- a/lib/mpi/mpi-inline.h +++ b/lib/mpi/mpi-inline.h @@ -30,7 +30,7 @@ #define G10_MPI_INLINE_H #ifndef G10_MPI_INLINE_DECL -#define G10_MPI_INLINE_DECL extern inline +#define G10_MPI_INLINE_DECL static inline #endif G10_MPI_INLINE_DECL mpi_limb_t |