From: Geert Uytterhoeven Date: Mon, 17 Jul 2017 13:24:28 +0000 (+0200) Subject: ARM: shmobile: Remove ARCH_SHMOBILE_MULTI X-Git-Tag: v4.14-rc1~68^2~13^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84a1e84b95bb7b2596821578c3acc38d4e6e7a59;p=thirdparty%2Fkernel%2Flinux.git ARM: shmobile: Remove ARCH_SHMOBILE_MULTI The migration from ARCH_SHMOBILE_MULTI to ARCH_RENESAS has been completed in v4.12 by commit 9ed2d4bc5c0c244d ("ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS"), so the ARCH_SHMOBILE_MULTI symbol can be removed. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index ad7d604ff0013..280e7312a9e1b 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -1,9 +1,6 @@ config ARCH_SHMOBILE bool -config ARCH_SHMOBILE_MULTI - bool - config PM_RMOBILE bool select PM @@ -34,7 +31,6 @@ menuconfig ARCH_RENESAS depends on ARCH_MULTI_V7 && MMU select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARCH_SHMOBILE - select ARCH_SHMOBILE_MULTI select ARM_GIC select GPIOLIB select HAVE_ARM_SCU if SMP