diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 02:47:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 02:50:06 -0400 |
commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /lib/string_helpers.c | |
parent | 99dd5497e5be4fe4194cad181d45fd6569a930db (diff) | |
parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/string_helpers.c')
-rw-r--r-- | lib/string_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index ab431d4cc970..dd4ece372699 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
7 | #include <linux/math64.h> | 7 | #include <linux/math64.h> |
8 | #include <linux/module.h> | 8 | #include <linux/export.h> |
9 | #include <linux/string_helpers.h> | 9 | #include <linux/string_helpers.h> |
10 | 10 | ||
11 | /** | 11 | /** |