diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 08:58:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 08:58:38 +0200 |
| commit | 50e0d10232db05c6776afcf6098459bff47e8b15 (patch) | |
| tree | 0e89971de6d960c8946cc9351d73b297347a0260 /security/apparmor | |
| parent | Merge branch 'linux-next' of git://git.open-osd.org/linux-open-osd (diff) | |
| parent | Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhow... (diff) | |
| download | linux-50e0d10232db05c6776afcf6098459bff47e8b15.tar.xz linux-50e0d10232db05c6776afcf6098459bff47e8b15.zip | |
Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"This has three changes for asm-generic that did not really fit into
any other branch as normal asm-generic changes do. One is a fix for a
build warning, the other two are more interesting:
* A patch from Mark Brown to allow using the common clock
infrastructure on all architectures, so we can use the clock API in
architecture independent device drivers.
* The UAPI split patches from David Howells for the asm-generic
files. There are other architecture specific series that are going
through the arch maintainer tree and that depend on this one.
There may be a few small merge conflicts between Mark's patch and the
following arch header file split patches. In each case the solution
will be to keep the new "generic-y += clkdev.h" line, even if it ends
up being the only line in the Kbuild file."
* tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
UAPI: (Scripted) Disintegrate include/asm-generic
asm-generic: Add default clkdev.h
asm-generic: xor: mark static functions as __maybe_unused
Diffstat (limited to 'security/apparmor')
| -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 806bd19af7f2..7b3021cebbea 100644 --- a/security/apparmor/Makefile +++ b/security/apparmor/Makefile @@ -60,6 +60,6 @@ $(obj)/resource.o : $(obj)/rlim_names.h $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \ $(src)/Makefile $(call cmd,make-caps) -$(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h \ +$(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \ $(src)/Makefile $(call cmd,make-rlim) |