diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 13:19:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 13:19:24 -0400 |
| commit | 29979aa8bd69becd94cbad59093807a417ce2a9e (patch) | |
| tree | 0eccf44cf5cfe5c919ca4a5ed160fb2992c70240 /scripts/kconfig/expr.h | |
| parent | 50c6dc9ebad0f1abde192696bea94c3bd2f24c18 (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: fix oldnoconfig to do the right thing
kconfig: Temporarily disable dependency warnings
kconfig: delay symbol direct dependency initialization
Diffstat (limited to 'scripts/kconfig/expr.h')
| -rw-r--r-- | scripts/kconfig/expr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 6ee2e4fb1481..170459c224a1 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
| @@ -165,7 +165,6 @@ struct menu { | |||
| 165 | struct symbol *sym; | 165 | struct symbol *sym; |
| 166 | struct property *prompt; | 166 | struct property *prompt; |
| 167 | struct expr *dep; | 167 | struct expr *dep; |
| 168 | struct expr *dir_dep; | ||
| 169 | unsigned int flags; | 168 | unsigned int flags; |
| 170 | char *help; | 169 | char *help; |
| 171 | struct file *file; | 170 | struct file *file; |