diff options
author | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
commit | 54ef2b96879334caf8803fdd93b4c556d709d6fd (patch) | |
tree | 05cfeb36feeb4451f8f4c7069a86ae3490027daf /arch/frv/include/asm/Kbuild | |
parent | cdrom: Random writing support for BD-RE media (diff) | |
parent | Merge tag 'v4.3-rc4' into for-4.4/core (diff) | |
download | linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.xz linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.zip |
Merge branch 'for-4.4/core' into for-4.4/drivers
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'arch/frv/include/asm/Kbuild')
-rw-r--r-- | arch/frv/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 8e47b832cc76..1fa084cf1a43 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -7,3 +7,4 @@ generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h generic-y += preempt.h generic-y += trace_clock.h +generic-y += word-at-a-time.h |