summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/Kbuild
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-12-14 11:14:00 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2016-12-14 11:14:00 +0000
commited141f2890cdb738fc7131367f5fb15632bc3e60 (patch)
treee6fd1b117b7d8968855e7f2d2f209ae102bf0be8 /arch/arm/include/asm/Kbuild
parent41884629fe579bde263dfc3d1284d0f5c7af7d1a (diff)
parent219622b7b3dc578799c067f316845ec18dee7d65 (diff)
Merge branch 'syscalls' into for-linus
Conflicts: arch/arm/include/asm/unistd.h arch/arm/include/uapi/asm/unistd.h arch/arm/kernel/calls.S
Diffstat (limited to 'arch/arm/include/asm/Kbuild')
-rw-r--r--arch/arm/include/asm/Kbuild3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 55e0e3ea9cb6..efb21757d41f 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -38,3 +38,6 @@ generic-y += termios.h
generic-y += timex.h
generic-y += trace_clock.h
generic-y += unaligned.h
+
+generated-y += mach-types.h
+generated-y += unistd-nr.h