diff options
author | Michal Marek <mmarek@suse.cz> | 2011-06-08 11:40:20 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 12:03:57 -0400 |
commit | 36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd (patch) | |
tree | 02cf4abcfc033d75f11b00055280e14eeb86e7e0 /scripts/kconfig/expr.h | |
parent | a61944c251c3e68c4bbf6eb96ff61c7b286351c5 (diff) | |
parent | 1ea3ad4e93222faf1d138ceb10291376d2da7cc6 (diff) |
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 { | |||
172 | #define MENU_CHANGED 0x0001 | 172 | #define MENU_CHANGED 0x0001 |
173 | #define MENU_ROOT 0x0002 | 173 | #define MENU_ROOT 0x0002 |
174 | 174 | ||
175 | #ifndef SWIG | ||
176 | |||
177 | extern struct file *file_list; | 175 | extern struct file *file_list; |
178 | extern struct file *current_file; | 176 | extern struct file *current_file; |
179 | struct file *lookup_file(const char *name); | 177 | struct file *lookup_file(const char *name); |
@@ -218,7 +216,6 @@ static inline int expr_is_no(struct expr *e) | |||
218 | { | 216 | { |
219 | return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); | 217 | return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); |
220 | } | 218 | } |
221 | #endif | ||
222 | 219 | ||
223 | #ifdef __cplusplus | 220 | #ifdef __cplusplus |
224 | } | 221 | } |