From 79051b30298ac1cd670ce5a83c9165698af171ee Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Sun, 5 Dec 2010 01:41:16 -0500
Subject: [PATCH] --- yaml --- r: 227661 b: refs/heads/master c:
 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc h: refs/heads/master i:   227659:
 f917c0f93c83768bea7950e0c153af34b3a05719 v: v3

---
 [refs]                           | 2 +-
 trunk/scripts/kconfig/confdata.c | 6 +++---
 trunk/scripts/kconfig/symbol.c   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fdb1d2a9dc28..2447d30f697e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ebfa5198ee96f34f2ee4ae95c92318f07341fbd
+refs/heads/master: 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc
diff --git a/trunk/scripts/kconfig/confdata.c b/trunk/scripts/kconfig/confdata.c
index d1bab0f42d10..61c35bf2d9cb 100644
--- a/trunk/scripts/kconfig/confdata.c
+++ b/trunk/scripts/kconfig/confdata.c
@@ -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.
 	 */
@@ -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.
 	 */
diff --git a/trunk/scripts/kconfig/symbol.c b/trunk/scripts/kconfig/symbol.c
index c0efe102d655..60830ce4a0a9 100644
--- a/trunk/scripts/kconfig/symbol.c
+++ b/trunk/scripts/kconfig/symbol.c
@@ -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: