From c8b861c43059a83cdf0123d7ff74287b12c31f30 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Wed, 17 Oct 2012 13:29:33 -0700
Subject: [PATCH] --- yaml --- r: 334447 b: refs/heads/master c:
 43c422eda99b894f18d1cca17bcd2401efaf7bd0 h: refs/heads/master i:   334445:
 d82ca3feb542aee4b2243dcd4767dfc8dd734ebc   334443:
 83c6eaf7f1fb4c9ec4adaafb226ab78c92b685ff   334439:
 c8c70af6fbac14e178c329a2f17a347fe78691be   334431:
 4dcb8e04ea32c2933d4ee799ebd6b99859c8ea99 v: v3

---
 [refs]                           | 2 +-
 trunk/security/apparmor/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 \