Skip to content

Commit

Permalink
Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/se…
Browse files Browse the repository at this point in the history
…linux into next
  • Loading branch information
James Morris committed Mar 4, 2016
2 parents d991284 + 9090a2d commit 5804602
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/selinux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o

selinux-$(CONFIG_NETLABEL) += netlabel.o

ccflags-y := -Isecurity/selinux -Isecurity/selinux/include
ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include

$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h

Expand Down

0 comments on commit 5804602

Please sign in to comment.