diff options
author | Robert Richter <robert.richter@amd.com> | 2010-10-21 11:39:26 +0200 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-10-21 11:39:26 +0200 |
commit | 328b8f1ba50b708a1b3c0acd7c41ee1b356822f6 (patch) | |
tree | 819e5cf05bcb160faee1eb546e3471284c9bbaae /scripts/kconfig/expr.h | |
parent | 57fa7214330be2e292ddb1402834ff0b221ef29a (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) |
Merge commit 'v2.6.36' into oprofile/core
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 6ee2e4fb148..170459c224a 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -165,7 +165,6 @@ struct menu { struct symbol *sym; struct property *prompt; struct expr *dep; - struct expr *dir_dep; unsigned int flags; char *help; struct file *file; |