diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 03:54:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 03:54:47 -0400 |
| commit | aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece (patch) | |
| tree | 3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 /scripts/kconfig/expr.h | |
| parent | cca8edfd2ec2a34d9f50f593bc753bb11e1bc1f5 (diff) | |
| parent | 3c6b50141ef9f0a8844bf1357b80c0cdf518bf05 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'scripts/kconfig/expr.h')
| -rw-r--r-- | scripts/kconfig/expr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 3d238db49764..16bfae2d3217 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
| @@ -20,12 +20,8 @@ struct file { | |||
| 20 | struct file *parent; | 20 | struct file *parent; |
| 21 | const char *name; | 21 | const char *name; |
| 22 | int lineno; | 22 | int lineno; |
| 23 | int flags; | ||
| 24 | }; | 23 | }; |
| 25 | 24 | ||
| 26 | #define FILE_BUSY 0x0001 | ||
| 27 | #define FILE_SCANNED 0x0002 | ||
| 28 | |||
| 29 | typedef enum tristate { | 25 | typedef enum tristate { |
| 30 | no, mod, yes | 26 | no, mod, yes |
| 31 | } tristate; | 27 | } tristate; |
