summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 14:28:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 14:28:20 -0700
commitcd816a0d84377c4e87f55cbe934a23417f9f5743 (patch)
tree8834341f81dc570f9f255af57ac28041c317226a
parent0d9f9e122c74583de15a86d1c660c08dc298f2c8 (diff)
parenta7a387cc596278af1516c534b50cc0bee171129d (diff)
downloadop-kernel-dev-cd816a0d84377c4e87f55cbe934a23417f9f5743.zip
op-kernel-dev-cd816a0d84377c4e87f55cbe934a23417f9f5743.tar.gz
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/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index f013982..58d80f3 100644
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -25,6 +25,6 @@ $(obj)/avc.o: $(obj)/flask.h
quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h
cmd_flask = scripts/selinux/genheaders/genheaders $(obj)/flask.h $(obj)/av_permissions.h
-targets += flask.h
+targets += flask.h av_permissions.h
$(obj)/flask.h: $(src)/include/classmap.h FORCE
$(call if_changed,flask)
OpenPOWER on IntegriCloud