Merge branch 'for-linus' of...

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.

parents 0d9f9e12 a7a387cc

security/selinux/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)