Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227661
b: refs/heads/master
c: 579fb8e
h: refs/heads/master
i:
  227659: f917c0f
v: v3
  • Loading branch information
Arnaud Lacombe authored and Michal Marek committed Dec 15, 2010
1 parent 601b375 commit 79051b3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1ebfa5198ee96f34f2ee4ae95c92318f07341fbd
refs/heads/master: 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc
6 changes: 3 additions & 3 deletions trunk/scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ static void randomize_choice_values(struct symbol *csym)
int cnt, def;

/*
* If choice is mod then we may have more items slected
* If choice is mod then we may have more items selected
* and if no then no-one.
* In both cases stop.
*/
Expand Down Expand Up @@ -1033,10 +1033,10 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)

/*
* We have different type of choice blocks.
* If curr.tri equal to mod then we can select several
* If curr.tri equals to mod then we can select several
* choice symbols in one block.
* In this case we do nothing.
* If curr.tri equal yes then only one symbol can be
* If curr.tri equals yes then only one symbol can be
* selected in a choice block and we set it to yes,
* and the rest to no.
*/
Expand Down
2 changes: 1 addition & 1 deletion trunk/scripts/kconfig/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ const char *sym_get_string_default(struct symbol *sym)
switch (sym->type) {
case S_BOOLEAN:
case S_TRISTATE:
/* The visibility imay limit the value from yes => mod */
/* The visibility may limit the value from yes => mod */
val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
break;
default:
Expand Down

0 comments on commit 79051b3

Please sign in to comment.