Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f6db7dcae3f4dd044bc8ffea87cbd7779dd4602b..efd53848947da4ee8a15b9b3b1f4648038f19e71 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -5,18 +5,13 @@ config ARCH_SHMOBILE_MULTI
        bool "Renesas ARM SoCs" if ARCH_MULTI_V7
        depends on MMU
        select ARCH_SHMOBILE
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
-       select HAVE_SMP
        select ARM_GIC
-       select MIGHT_HAVE_CACHE_L2X0
        select MIGHT_HAVE_PCI
        select NO_IOPORT
        select PINCTRL
        select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
 
 if ARCH_SHMOBILE_MULTI
 
@@ -114,8 +109,6 @@ config ARCH_R8A7778
        select CPU_V7
        select SH_CLK_CPG
        select ARM_GIC
-       select USB_ARCH_HAS_EHCI
-       select USB_ARCH_HAS_OHCI
        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_R8A7779
@@ -124,8 +117,6 @@ config ARCH_R8A7779
        select ARM_GIC
        select CPU_V7
        select SH_CLK_CPG
-       select USB_ARCH_HAS_EHCI
-       select USB_ARCH_HAS_OHCI
        select RENESAS_INTC_IRQPIN
        select SYS_SUPPORTS_SH_TMU