diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:28:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:28:20 -0400 |
| commit | cd816a0d84377c4e87f55cbe934a23417f9f5743 (patch) | |
| tree | 8834341f81dc570f9f255af57ac28041c317226a | |
| parent | 0d9f9e122c74583de15a86d1c660c08dc298f2c8 (diff) | |
| parent | a7a387cc596278af1516c534b50cc0bee171129d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELINUX: Fix build error.
| -rw-r--r-- | security/selinux/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/Makefile b/security/selinux/Makefile index f013982df417..58d80f3bd6f6 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile | |||
| @@ -25,6 +25,6 @@ $(obj)/avc.o: $(obj)/flask.h | |||
| 25 | quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h | 25 | quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h |
| 26 | cmd_flask = scripts/selinux/genheaders/genheaders $(obj)/flask.h $(obj)/av_permissions.h | 26 | cmd_flask = scripts/selinux/genheaders/genheaders $(obj)/flask.h $(obj)/av_permissions.h |
| 27 | 27 | ||
| 28 | targets += flask.h | 28 | targets += flask.h av_permissions.h |
| 29 | $(obj)/flask.h: $(src)/include/classmap.h FORCE | 29 | $(obj)/flask.h: $(src)/include/classmap.h FORCE |
| 30 | $(call if_changed,flask) | 30 | $(call if_changed,flask) |