diff options
author | Michal Marek <mmarek@suse.cz> | 2011-06-08 17:40:20 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 18:03:57 +0200 |
commit | 36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd (patch) | |
tree | 02cf4abcfc033d75f11b00055280e14eeb86e7e0 /scripts/kconfig/expr.h | |
parent | Merge commit 'v3.0-rc1' into kbuild/kconfig (diff) | |
parent | kconfig/gconf: silent missing prototype warnings (diff) | |
download | linux-36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd.tar.xz linux-36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd.zip |
Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig
Diffstat (limited to 'scripts/kconfig/expr.h')
-rw-r--r-- | scripts/kconfig/expr.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 16bfae2d3217..80fce57080cc 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -172,8 +172,6 @@ struct menu { #define MENU_CHANGED 0x0001 #define MENU_ROOT 0x0002 -#ifndef SWIG - extern struct file *file_list; extern struct file *current_file; struct file *lookup_file(const char *name); @@ -218,7 +216,6 @@ static inline int expr_is_no(struct expr *e) { return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); } -#endif #ifdef __cplusplus } |