diff options
| author | Olof Johansson | 2019-06-26 19:30:10 -0700 |
|---|---|---|
| committer | Olof Johansson | 2019-06-26 19:30:10 -0700 |
| commit | da4d0b289142208893f6e685b0bc279fb3173478 (patch) | |
| tree | 5d2b54b76ca3dcaa349c3eb3d668fd9b71131ec4 /arch/arm/mach-exynos/Makefile | |
| parent | a7d881464194920a04fb9b8c324877b32fd58a1f (diff) | |
| parent | a55e040c6f21f55f81c53c56e1d8095df35e1d02 (diff) | |
Merge tag 'samsung-soc-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc
Samsung mach/soc changes for v5.3
Only cleanups and minor fixes.
* tag 'samsung-soc-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: Cleanup cppcheck shifting warning
ARM: exynos: Only build MCPM support if used
ARM: exynos: Make ARCH_EXYNOS3 a default option
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
| -rw-r--r-- | arch/arm/mach-exynos/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 5ccf9d7e58d4..0fd3fcf8bfb0 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -14,5 +14,5 @@ obj-$(CONFIG_PM_SLEEP) += suspend.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o -obj-$(CONFIG_MCPM) += mcpm-exynos.o +obj-$(CONFIG_EXYNOS_MCPM) += mcpm-exynos.o CFLAGS_mcpm-exynos.o += -march=armv7-a |