diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:46:24 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:46:24 -0500 |
| commit | 25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch) | |
| tree | a8be3d3d314625a376be0e62c67809dc22274dd4 /scripts/kconfig/expr.h | |
| parent | 9326845f45650f6af9953a4b6a31e89b54fab82f (diff) | |
| parent | 59bdd133561a432c4655146e283caf85fa64c2fb (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'scripts/kconfig/expr.h')
| -rw-r--r-- | scripts/kconfig/expr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 184eb6a0b505..e57826ced380 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
| @@ -164,6 +164,7 @@ struct menu { | |||
| 164 | struct menu *list; | 164 | struct menu *list; |
| 165 | struct symbol *sym; | 165 | struct symbol *sym; |
| 166 | struct property *prompt; | 166 | struct property *prompt; |
| 167 | struct expr *visibility; | ||
| 167 | struct expr *dep; | 168 | struct expr *dep; |
| 168 | unsigned int flags; | 169 | unsigned int flags; |
| 169 | char *help; | 170 | char *help; |