diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 11:10:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 11:10:28 -0400 |
| commit | 82fc167c392a1700f9adbde639730ee8c8122474 (patch) | |
| tree | 373ab737a040dd21e5f98425e7c82a6cc4a83568 /arch/hexagon/include | |
| parent | e3e72ab80a3fac0b88e07d358a2c75724ccd66b4 (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
Merge tag 'v4.3-rc4' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/hexagon/include')
| -rw-r--r-- | arch/hexagon/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index daee37bd0999..db8ddabc6bd2 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild | |||
| @@ -58,4 +58,5 @@ generic-y += types.h | |||
| 58 | generic-y += ucontext.h | 58 | generic-y += ucontext.h |
| 59 | generic-y += unaligned.h | 59 | generic-y += unaligned.h |
| 60 | generic-y += vga.h | 60 | generic-y += vga.h |
| 61 | generic-y += word-at-a-time.h | ||
| 61 | generic-y += xor.h | 62 | generic-y += xor.h |