diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /security/selinux/ss/conditional.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/conditional.h')
| -rw-r--r-- | security/selinux/ss/conditional.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index 3f209c635295..4d1f87466508 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include "avtab.h" | 13 | #include "avtab.h" |
| 14 | #include "symtab.h" | 14 | #include "symtab.h" |
| 15 | #include "policydb.h" | 15 | #include "policydb.h" |
| 16 | #include "../include/conditional.h" | ||
| 16 | 17 | ||
| 17 | #define COND_EXPR_MAXDEPTH 10 | 18 | #define COND_EXPR_MAXDEPTH 10 |
| 18 | 19 | ||