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/Makefile | |
parent | 41884629fe579bde263dfc3d1284d0f5c7af7d1a (diff) | |
parent | 219622b7b3dc578799c067f316845ec18dee7d65 (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/Makefile')
-rw-r--r-- | arch/arm/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6be9ee148b78..5a26576fba9a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -311,8 +311,11 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS) boot := arch/arm/boot +archheaders: + $(Q)$(MAKE) $(build)=arch/arm/tools uapi + archprepare: - $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h + $(Q)$(MAKE) $(build)=arch/arm/tools kapi # Convert bzImage to zImage bzImage: zImage |