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/01-kconfig-kernel-to-buildroot.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/01-kconfig-kernel-to-buildroot.patch')
| -rw-r--r-- | package/config/patches/01-kconfig-kernel-to-buildroot.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/package/config/patches/01-kconfig-kernel-to-buildroot.patch index 9df22d491..08fabc13a 100644 --- a/package/config/patches/01-kconfig-kernel-to-buildroot.patch +++ b/package/config/patches/01-kconfig-kernel-to-buildroot.patch @@ -1,13 +1,13 @@ --- conf.c | 12 ++++++------ - confdata.c | 12 ++++-------- + confdata.c | 14 +++++++------- gconf.c | 4 ++-- gconf.glade | 2 +- mconf.c | 38 ++++++++++++++++++-------------------- qconf.cc | 4 ++-- zconf.tab.c_shipped | 2 +- zconf.y | 2 +- - 8 files changed, 35 insertions(+), 41 deletions(-) + 8 files changed, 38 insertions(+), 40 deletions(-) Index: config/conf.c =================================================================== @@ -60,7 +60,7 @@ Index: config/confdata.c =================================================================== --- config.orig/confdata.c +++ config/confdata.c -@@ -579,7 +579,7 @@ +@@ -581,7 +581,7 @@ if (!out) return 1; @@ -69,7 +69,7 @@ Index: config/confdata.c sym_calc_value(sym); time(&now); env = getenv("KCONFIG_NOTIMESTAMP"); -@@ -588,7 +588,7 @@ +@@ -590,7 +590,7 @@ fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" @@ -78,7 +78,7 @@ Index: config/confdata.c "%s%s" "#\n"), sym_get_string_value(sym), -@@ -802,25 +802,25 @@ +@@ -804,25 +804,25 @@ return 1; } |