diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
commit | ed5c8c854f2b990dfa4d85c4995d115768a05d3c (patch) | |
tree | a4a826795ec6784f25bebade98bdb20121d9c211 /arch/x86/boot/string.c | |
parent | 619bd4a71874a8fd78eb6ccf9f272c5e98bcc7b7 (diff) | |
parent | a2ca3d617944417e9dd5f09fc8a4549cda115f4f (diff) | |
download | blackbird-obmc-linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.tar.gz blackbird-obmc-linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.zip |
Merge branch 'linus' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/string.c')
-rw-r--r-- | arch/x86/boot/string.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index cc3bd583dce1..9e240fcba784 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include "ctype.h" +#include "string.h" int memcmp(const void *s1, const void *s2, size_t len) { |