summaryrefslogtreecommitdiffstats
path: root/arch/frv/include/asm/Kbuild
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-10-06 02:36:38 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-10-06 02:36:38 +0200
commit7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch)
treefeb5198f57bfb5b58aca24ddc76a313236f94512 /arch/frv/include/asm/Kbuild
parentInput: turbografx - store object in correct index (diff)
parentLinux 4.3-rc4 (diff)
downloadlinux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.tar.xz
linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.zip
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'arch/frv/include/asm/Kbuild')
-rw-r--r--arch/frv/include/asm/Kbuild1
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