grab some static updates from linux-2.6 git to fix gcc4 build errors as reported...

diff --git a/package/config/lkc.h b/package/config/lkc.h
index dd040f7a86276d35e5fe225086370dc0a9546636..e348ee7d86a54d471e372dacb364550763296f40 100644 (file)
--- a/package/config/lkc.h
+++ b/package/config/lkc.h
@@ -59,9 +59,6 @@ void menu_set_type(int type);
 struct file *file_lookup(const char *name);
 int file_write_dep(const char *name);
 
-extern struct menu *current_entry;
-extern struct menu *current_menu;
-
 /* symbol.c */
 void sym_init(void);
 void sym_clear_all_valid(void);

diff --git a/package/config/menu.c b/package/config/menu.c
index 6425296fc334893702cb317d1d3fab64a7616e27..7f100a643b4af465720f85ee8ba4f74960fae10d 100644 (file)
--- a/package/config/menu.c
+++ b/package/config/menu.c
@@ -10,7 +10,6 @@
 #include "lkc.h"
 
 struct menu rootmenu;
-struct menu *current_menu, *current_entry;
 static struct menu **last_entry_ptr;
 
 struct file *file_list;

diff --git a/package/config/zconf.tab.c_shipped b/package/config/zconf.tab.c_shipped
index 83dbf9ed57b291c444ba8c4f8d2fe42d7d6c6660..b4fc1a9010fe3d56e32ab6d3213009f986ac15dd 100644 (file)
--- a/package/config/zconf.tab.c_shipped
+++ b/package/config/zconf.tab.c_shipped
@@ -175,6 +175,8 @@ static bool zconf_endtoken(int token, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[257];
 
+static struct menu *current_menu, *current_entry;
+
 #define YYERROR_VERBOSE
 
 

diff --git a/package/config/zconf.y b/package/config/zconf.y
index f354c89e6c55a6fcb3b667992087bdce2de6b4de..896cdb61765a72041600adb5e6d7e6fe352db4c1 100644 (file)
--- a/package/config/zconf.y
+++ b/package/config/zconf.y
@@ -25,6 +25,8 @@ static bool zconf_endtoken(int token, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[257];
 
+static struct menu *current_menu, *current_entry;
+
 #define YYERROR_VERBOSE
 %}
 %expect 40