diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-17 23:46:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-17 23:46:05 -0800 |
| commit | 8c5cdedfddc32192e347ceefd9796e712d29c6be (patch) | |
| tree | ddd88c4fc655661c0c090702c7dd2ee643aafee3 | |
| parent | 94a07de1902e96253033831fac08a70d192a53c6 (diff) | |
| parent | 494975c9cc00f69bf71de0991dcebda9b2911aa0 (diff) | |
| download | talos-obmc-linux-8c5cdedfddc32192e347ceefd9796e712d29c6be.tar.gz talos-obmc-linux-8c5cdedfddc32192e347ceefd9796e712d29c6be.zip | |
Merge tag 'v4.9-next-kconfig' of https://github.com/mbgg/linux-mediatek into next/soc
- clean up mach-mediatek Makefile as kbuild only descends into the folder if
ARCH_MEDIATEK is enabled
* tag 'v4.9-next-kconfig' of https://github.com/mbgg/linux-mediatek:
ARM: mediatek: clean up mach-mediatek/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-mediatek/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile index 21164605b83f..dadae67d79b7 100644 --- a/arch/arm/mach-mediatek/Makefile +++ b/arch/arm/mach-mediatek/Makefile @@ -1,4 +1,2 @@ -ifeq ($(CONFIG_SMP),y) -obj-$(CONFIG_ARCH_MEDIATEK) += platsmp.o -endif -obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o +obj-$(CONFIG_SMP) += platsmp.o +obj-y += mediatek.o |
