diff options
author | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
commit | 2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch) | |
tree | 4ae051577dad1161c91dafbf4207bb10a9dc91bb /scripts/genksyms/parse.c_shipped | |
parent | 9b4ce7bce5f30712fd926ab4599a803314a07719 (diff) | |
parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'scripts/genksyms/parse.c_shipped')
-rw-r--r-- | scripts/genksyms/parse.c_shipped | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/genksyms/parse.c_shipped b/scripts/genksyms/parse.c_shipped index eaee44e66a43..809b949e495b 100644 --- a/scripts/genksyms/parse.c_shipped +++ b/scripts/genksyms/parse.c_shipped | |||
@@ -160,7 +160,7 @@ | |||
160 | 160 | ||
161 | 161 | ||
162 | #include <assert.h> | 162 | #include <assert.h> |
163 | #include <malloc.h> | 163 | #include <stdlib.h> |
164 | #include "genksyms.h" | 164 | #include "genksyms.h" |
165 | 165 | ||
166 | static int is_typedef; | 166 | static int is_typedef; |