Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-virt / Kconfig

diff --git a/arch/arm/mach-virt/Kconfig b/arch/arm/mach-virt/Kconfig
index 081d469..eaad072 100644 (file)
--- a/arch/arm/mach-virt/Kconfig
+++ b/arch/arm/mach-virt/Kconfig
@@ -1,10 +1,6 @@
 config ARCH_VIRT
        bool "Dummy Virtual Machine" if ARCH_MULTI_V7
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
        select ARM_PSCI
        select HAVE_SMP
-       select CPU_V7
-       select SPARSE_IRQ
-       select USE_OF