diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:48:13 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:49:06 -0500 |
| commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e (patch) | |
| tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e /security/apparmor/Makefile | |
| parent | f7200d4c504a385b1b70f3bab379f99745f7ef6a (diff) | |
| parent | 517ffce4e1a03aea979fe3a18a3dd1761a24fafb (diff) | |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/apparmor/Makefile')
| -rw-r--r-- | security/apparmor/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile index 7b3021cebbea..5706b74c857f 100644 --- a/security/apparmor/Makefile +++ b/security/apparmor/Makefile | |||
| @@ -57,7 +57,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ | |||
| 57 | 57 | ||
| 58 | $(obj)/capability.o : $(obj)/capability_names.h | 58 | $(obj)/capability.o : $(obj)/capability_names.h |
| 59 | $(obj)/resource.o : $(obj)/rlim_names.h | 59 | $(obj)/resource.o : $(obj)/rlim_names.h |
| 60 | $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \ | 60 | $(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \ |
| 61 | $(src)/Makefile | 61 | $(src)/Makefile |
| 62 | $(call cmd,make-caps) | 62 | $(call cmd,make-caps) |
| 63 | $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \ | 63 | $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \ |