diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /scripts/kconfig/expr.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 7d39ff43e6e1..1b36ef18c48d 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
| @@ -93,7 +93,6 @@ struct symbol { | |||
| 93 | #define SYMBOL_NEW 0x0800 | 93 | #define SYMBOL_NEW 0x0800 |
| 94 | #define SYMBOL_AUTO 0x1000 | 94 | #define SYMBOL_AUTO 0x1000 |
| 95 | #define SYMBOL_CHECKED 0x2000 | 95 | #define SYMBOL_CHECKED 0x2000 |
| 96 | #define SYMBOL_CHECK_DONE 0x4000 | ||
| 97 | #define SYMBOL_WARNED 0x8000 | 96 | #define SYMBOL_WARNED 0x8000 |
| 98 | 97 | ||
| 99 | #define SYMBOL_MAXLENGTH 256 | 98 | #define SYMBOL_MAXLENGTH 256 |