diff --git a/[refs] b/[refs] index eef00eec9d90..26e62a6ee2f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 985c9e615a605041d728c08b83d3dda19ae7def8 +refs/heads/master: 43c422eda99b894f18d1cca17bcd2401efaf7bd0 diff --git a/trunk/security/apparmor/Makefile b/trunk/security/apparmor/Makefile index 7b3021cebbea..5706b74c857f 100644 --- a/trunk/security/apparmor/Makefile +++ b/trunk/security/apparmor/Makefile @@ -57,7 +57,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ $(obj)/capability.o : $(obj)/capability_names.h $(obj)/resource.o : $(obj)/rlim_names.h -$(obj)/capability_names.h : $(srctree)/include/linux/capability.h \ +$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \ $(src)/Makefile $(call cmd,make-caps) $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \