diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 11:14:00 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 11:14:00 +0000 |
| commit | ed141f2890cdb738fc7131367f5fb15632bc3e60 (patch) | |
| tree | e6fd1b117b7d8968855e7f2d2f209ae102bf0be8 /arch/arm/include/asm/Kbuild | |
| parent | Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus (diff) | |
| parent | ARM: wire up new pkey syscalls (diff) | |
| download | linux-dev-ed141f2890cdb738fc7131367f5fb15632bc3e60.tar.xz linux-dev-ed141f2890cdb738fc7131367f5fb15632bc3e60.zip | |
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/Kbuild | 3 |
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 |