diff options
| author | Adam Langley <agl@google.com> | 2015-02-03 03:30:27 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-02-03 03:30:27 +0300 |
| commit | 64b17ccf15b9c8fdd79555e76e5ab5d108f2a3df (patch) | |
| tree | f878a7549cc1f592446549144c0172597223ccdd /crypto/cpu-arm.c | |
| parent | 23343e4b12670dbc0e3b7587ef7179589bc1b1a5 (diff) | |
Fix patch collision of d062c8af and 2b2d66d4.
These two patches conflicted but, because it wasn't a textual conflict,
Gerrit didn't notice.
Change-Id: I53464127e5e71dfa2f6c8a8847b41968671c2047
Diffstat (limited to 'crypto/cpu-arm.c')
| -rw-r--r-- | crypto/cpu-arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/cpu-arm.c b/crypto/cpu-arm.c index 12098bdf..5ecdb1a3 100644 --- a/crypto/cpu-arm.c +++ b/crypto/cpu-arm.c @@ -19,6 +19,7 @@ #include <inttypes.h> #include <setjmp.h> #include <signal.h> +#include <string.h> #include "arm_arch.h" |