Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e8b8c977734193adedf2b0f607d6252c78e86394
Commit:     e8b8c977734193adedf2b0f607d6252c78e86394
Parent:     c00046c279a2521075250fad682ca0acc10d4fd7
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 19 21:25:45 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Oct 19 21:25:45 2007 -0700

    Revert "kconfig: tristate choices with mixed tristate and boolean values"
    
    This reverts commit a5bf3d891a6a0fb5aa122792d965e3774108b923.
    
    David Brownell notes that this causes a regression visible in the
    drivers/usb/gadget Kconfig file:
    
      "That Kconfig hasn't changed (other than adding new drivers), and it's
       worked that way for several years now ...  so the issue seems to be
       changes in menuconfig/kconfig/etc semantics.
    
       The issue is that when USB_GADGET=m, it's no longer possible to
       configure peripheral controller drivers as modules ...  the
       controller drivers can now only be configured for static linkage.
    
       It should be making a choice of one of the controller drivers which
       could work on the target system, and allow that driver to be linked
       either as a module (ok iff USB_GADGET=m) or statically."
    
    Reverting this commit resolves the problem, and also fixes a second
    problem that David noticed: various dependent options couldn't be enabled.
    
    Tested-and-reported-by: David Brownell <[EMAIL PROTECTED]>
    Cc: Randy Dunlap <[EMAIL PROTECTED]>
    Cc: Jan Beulich <[EMAIL PROTECTED]>,
    Cc: Andrew Morton <[EMAIL PROTECTED]>,
    Cc: Sam Ravnborg <[EMAIL PROTECTED]>,
    Cc: Roman Zippel <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 scripts/kconfig/menu.c |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 7bfa181..f9d0d91 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -235,23 +235,16 @@ void menu_finalize(struct menu *parent)
        sym = parent->sym;
        if (parent->list) {
                if (sym && sym_is_choice(sym)) {
-                       /* find out choice type */
-                       enum symbol_type type = S_UNKNOWN;
-
+                       /* find the first choice value and find out choice type 
*/
                        for (menu = parent->list; menu; menu = menu->next) {
-                               if (menu->sym && menu->sym->type != S_UNKNOWN) {
-                                       if (type == S_UNKNOWN)
-                                               type = menu->sym->type;
-                                       if (type != S_BOOLEAN)
-                                               break;
-                                       if (menu->sym->type == S_TRISTATE) {
-                                               type = S_TRISTATE;
-                                               break;
-                                       }
+                               if (menu->sym) {
+                                       current_entry = parent;
+                                       menu_set_type(menu->sym->type);
+                                       current_entry = menu;
+                                       menu_set_type(sym->type);
+                                       break;
                                }
                        }
-                       current_entry = parent;
-                       menu_set_type(type);
                        parentdep = expr_alloc_symbol(sym);
                } else if (parent->prompt)
                        parentdep = parent->prompt->visible.expr;
@@ -260,16 +253,7 @@ void menu_finalize(struct menu *parent)
 
                for (menu = parent->list; menu; menu = menu->next) {
                        basedep = expr_transform(menu->dep);
-                       dep = parentdep;
-                       if (sym && sym_is_choice(sym) && menu->sym) {
-                               enum symbol_type type = menu->sym->type;
-
-                               if (type == S_UNKNOWN)
-                                       type = sym->type;
-                            if (type != S_TRISTATE)
-                                       dep = expr_alloc_comp(E_EQUAL, sym, 
&symbol_yes);
-                       }
-                       basedep = expr_alloc_and(expr_copy(dep), basedep);
+                       basedep = expr_alloc_and(expr_copy(parentdep), basedep);
                        basedep = expr_eliminate_dups(basedep);
                        menu->dep = basedep;
                        if (menu->sym)
@@ -342,8 +326,7 @@ void menu_finalize(struct menu *parent)
                                            "values not supported");
                        }
                        current_entry = menu;
-                       if (menu->sym->type == S_UNKNOWN)
-                               menu_set_type(sym->type);
+                       menu_set_type(sym->type);
                        menu_add_symbol(P_CHOICE, sym, NULL);
                        prop = sym_get_choice_prop(sym);
                        for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to