diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 10:39:48 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 15:54:33 +0100 |
commit | 359a922659c6b33c44ab7c4f94de7d801a8bea63 (patch) | |
tree | d56ad42cbe74fb823bb1876cd0437507b5977712 /package/config/patches/15-use-PATH_MAX-for-path-buffer.patch | |
parent | a7306b8aa5b51f7c6e9f5327e0bd80c11cfadda6 (diff) |
package/config: Rebase against Linux 2.6.36
No significant changes, but makes it easier to rebase against newer
versions.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/patches/15-use-PATH_MAX-for-path-buffer.patch')
-rw-r--r-- | package/config/patches/15-use-PATH_MAX-for-path-buffer.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch b/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch index 4be6cb6a2..816aa446a 100644 --- a/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch +++ b/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch @@ -11,14 +11,14 @@ Signed-off-by: Will Newton <will.newton@imgtec.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz> --- - scripts/kconfig/confdata.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + confdata.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/confdata.c b/confdata.c -index 35c08ec..96110ea 100644 ---- a/confdata.c -+++ b/confdata.c -@@ -534,7 +534,7 @@ int conf_write(const char *name) +Index: config/confdata.c +=================================================================== +--- config.orig/confdata.c ++++ config/confdata.c +@@ -536,7 +536,7 @@ struct menu *menu; const char *basename; const char *str; @@ -27,7 +27,7 @@ index 35c08ec..96110ea 100644 enum symbol_type type; time_t now; int use_timestamp = 1; -@@ -658,7 +658,7 @@ next: +@@ -660,7 +660,7 @@ static int conf_split_config(void) { const char *name; @@ -36,6 +36,3 @@ index 35c08ec..96110ea 100644 char *opwd, *dir, *_name; char *s, *d, c; struct symbol *sym; --- -1.7.1 - |