summaryrefslogtreecommitdiffstats
path: root/support/kconfig/patches/09-implement-kconfig-probability.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-04-04 11:24:24 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2013-04-11 09:30:39 +0200
commit6997e461fdb39985957d24d81e612113cf39e35c (patch)
tree096947e214caf457ffdb005522698f3e747ad08a /support/kconfig/patches/09-implement-kconfig-probability.patch
parentcfe70c5e13fcf6d99394c646c758236a79041653 (diff)
downloadbuildroot-novena-6997e461fdb39985957d24d81e612113cf39e35c.tar.gz
buildroot-novena-6997e461fdb39985957d24d81e612113cf39e35c.zip
support/kconfig: upgrade to 3.9-rc2
Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except: * Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes. * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'support/kconfig/patches/09-implement-kconfig-probability.patch')
-rw-r--r--support/kconfig/patches/09-implement-kconfig-probability.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/support/kconfig/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
index 3b6eb898f..72e2a254f 100644
--- a/support/kconfig/patches/09-implement-kconfig-probability.patch
+++ b/support/kconfig/patches/09-implement-kconfig-probability.patch
@@ -2,11 +2,11 @@
confdata.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
-Index: kconfig/confdata.c
+Index: b/confdata.c
===================================================================
---- kconfig.orig/confdata.c
-+++ kconfig/confdata.c
-@@ -982,7 +982,16 @@
+--- a/confdata.c
++++ b/confdata.c
+@@ -1107,7 +1107,16 @@
void conf_set_all_new_symbols(enum conf_def_mode mode)
{
struct symbol *sym, *csym;
@@ -24,7 +24,7 @@ Index: kconfig/confdata.c
for_all_symbols(i, sym) {
if (sym_has_value(sym))
-@@ -1001,8 +1010,15 @@
+@@ -1126,8 +1135,15 @@
sym->def[S_DEF_USER].tri = no;
break;
case def_random: