diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:54:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:54:35 -0700 |
| commit | 378102f364d3fba88b8162df13d639d620e9272c (patch) | |
| tree | 4d08ab65dc1e99d47c1b53fb7d7640711ea46cf6 /arch/unicore32/include/asm/Kbuild | |
| parent | 1a76eb5b04062cf2a32d5c7f0aefc9d92c3f986a (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| download | blackbird-op-linux-378102f364d3fba88b8162df13d639d620e9272c.tar.gz blackbird-op-linux-378102f364d3fba88b8162df13d639d620e9272c.zip | |
Merge 4.3-rc5 into tty-next
We want the tty fixes and reverts in here as well so that people can
properly test and use it.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/unicore32/include/asm/Kbuild')
| -rw-r--r-- | arch/unicore32/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild index 1fc7a286dc6f..256c45b3ae34 100644 --- a/arch/unicore32/include/asm/Kbuild +++ b/arch/unicore32/include/asm/Kbuild @@ -62,4 +62,5 @@ generic-y += ucontext.h generic-y += unaligned.h generic-y += user.h generic-y += vga.h +generic-y += word-at-a-time.h generic-y += xor.h |
