diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
commit | 416b0c0faf634abc09568885cb95266ce669c606 (patch) | |
tree | bf63b94f57246fbf264c93bfdd6233395b07ef89 /arch/arc/Makefile | |
parent | Merge branch 'x86/asm' into x86/apic (diff) | |
parent | page waitqueue: always add new entries at the end (diff) | |
download | linux-416b0c0faf634abc09568885cb95266ce669c606.tar.xz linux-416b0c0faf634abc09568885cb95266ce669c606.zip |
Merge branch 'linus' into x86/apic, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/Makefile')
-rw-r--r-- | arch/arc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 44ef35d33956..3a61cfcc38c0 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -107,7 +107,7 @@ core-y += arch/arc/ # w/o this dtb won't embed into kernel binary core-y += arch/arc/boot/dts/ -core-$(CONFIG_ARC_PLAT_SIM) += arch/arc/plat-sim/ +core-y += arch/arc/plat-sim/ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ core-$(CONFIG_ARC_PLAT_AXS10X) += arch/arc/plat-axs10x/ core-$(CONFIG_ARC_PLAT_EZNPS) += arch/arc/plat-eznps/ |