diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 03:36:38 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 03:36:38 +0300 |
| commit | 7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch) | |
| tree | feb5198f57bfb5b58aca24ddc76a313236f94512 /arch/cris/include/asm/Kbuild | |
| parent | c65cf815653ec64e73d40819806c2d1aed91681e (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| download | linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.tar.xz | |
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'arch/cris/include/asm/Kbuild')
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index b7f68192d15b..1778805f6380 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -43,4 +43,5 @@ generic-y += topology.h generic-y += trace_clock.h generic-y += types.h generic-y += vga.h +generic-y += word-at-a-time.h generic-y += xor.h |