diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /scripts/kconfig/util.c | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'scripts/kconfig/util.c')
| -rw-r--r-- | scripts/kconfig/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 81c100d953ef..78b5c04e736b 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
| @@ -72,7 +72,7 @@ int file_write_dep(const char *name) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | 74 | ||
| 75 | /* Allocate initial growable sting */ | 75 | /* Allocate initial growable string */ |
| 76 | struct gstr str_new(void) | 76 | struct gstr str_new(void) |
| 77 | { | 77 | { |
| 78 | struct gstr gs; | 78 | struct gstr gs; |