Merge v2.6.37-rc8 into powerpc/next

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 6ee2e4fb1481..e57826ced380 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -18,7 +18,7 @@ extern "C" {
 struct file {
         struct file *next;
         struct file *parent;
-        char *name;
+        const char *name;
         int lineno;
         int flags;
 };
@@ -164,8 +164,8 @@ struct menu {
         struct menu *list;
         struct symbol *sym;
         struct property *prompt;
+        struct expr *visibility;
         struct expr *dep;
-        struct expr *dir_dep;
         unsigned int flags;
         char *help;
         struct file *file;