diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 17:18:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 17:19:03 +0200 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /lib/parser.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/parser.c')
| -rw-r--r-- | lib/parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/parser.c b/lib/parser.c index dcbaaef6cf1..c4341008483 100644 --- a/lib/parser.c +++ b/lib/parser.c @@ -6,7 +6,8 @@ */ #include <linux/ctype.h> -#include <linux/module.h> +#include <linux/types.h> +#include <linux/export.h> #include <linux/parser.h> #include <linux/slab.h> #include <linux/string.h> |