diff --git a/[refs] b/[refs]
index 6dee679a5e9c..4896ed633145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d74db3b22a75fac474abe711f582ffe25eacce25
+refs/heads/master: 42d5aaa2d826f54924e260b58a8e410e59d54163
diff --git a/trunk/security/Makefile b/trunk/security/Makefile
index 35f50c585e2b..fa77021d9778 100644
--- a/trunk/security/Makefile
+++ b/trunk/security/Makefile
@@ -16,9 +16,9 @@ obj-$(CONFIG_SECURITYFS)		+= inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
 obj-$(CONFIG_SECURITY_SMACK)		+= smack/built-in.o
+obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)		+= root_plug.o
 obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o
-obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o
 
 # Object integrity file lists
 subdir-$(CONFIG_IMA)			+= integrity/ima