diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-20 00:03:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-20 00:03:37 +0200 |
| commit | 95ab29a1f1c41fb958ff67926cc0c8e08c89d38e (patch) | |
| tree | 95ba9d0c5fa04f42345751bef4f413affc7077d5 /arch/arm/mach-uniphier/Makefile | |
| parent | 1c90e170fef7df71f09be837e65641cf5c687dce (diff) | |
| parent | dd34b115666a1ccc69e3af52cc92c7410490f4fd (diff) | |
| download | linux-95ab29a1f1c41fb958ff67926cc0c8e08c89d38e.tar.gz linux-95ab29a1f1c41fb958ff67926cc0c8e08c89d38e.tar.bz2 linux-95ab29a1f1c41fb958ff67926cc0c8e08c89d38e.zip | |
Merge tag 'uniphier-soc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/soc
Pull "UniPhier ARM SoC updates for v4.9" from Masahiro Yamada:
* Remove unneeded SMP code
* tag 'uniphier-soc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
ARM: uniphier: remove SoC-specific SMP code
Diffstat (limited to 'arch/arm/mach-uniphier/Makefile')
| -rw-r--r-- | arch/arm/mach-uniphier/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index 396afe109e67..6bea3d3a2dd7 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -1 +1 @@ -obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj- += dummy.o |