diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 15:58:38 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 15:58:38 +0900 |
commit | 50e0d10232db05c6776afcf6098459bff47e8b15 (patch) | |
tree | 0e89971de6d960c8946cc9351d73b297347a0260 /arch/ia64/include | |
parent | 8711798772641b2f593beebebcab5b1ec2309f0c (diff) | |
parent | c37d6154c0b9163c27e53cc1d0be3867b4abd760 (diff) | |
download | linux-50e0d10232db05c6776afcf6098459bff47e8b15.tar.gz |
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 'arch/ia64/include')
-rw-r--r-- | arch/ia64/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index d4eb9383f5f6..58f3d14a6cd4 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -13,3 +13,4 @@ header-y += ptrace_offsets.h header-y += rse.h header-y += ucontext.h header-y += ustack.h +generic-y += clkdev.h |