Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 21f457b..1b4fafe 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,5 +1,6 @@
 config ARCH_SHMOBILE
        bool
+       select ZONE_DMA if ARM_LPAE
 
 config PM_RCAR
        bool
@@ -18,6 +19,7 @@ config ARCH_RCAR_GEN2
        select PM_RCAR if PM || SMP
        select RENESAS_IRQC
        select SYS_SUPPORTS_SH_CMT
+       select PCI_DOMAINS if PCI
 
 config ARCH_RMOBILE
        bool
@@ -36,7 +38,6 @@ menuconfig ARCH_SHMOBILE_MULTI
        select NO_IOPORT_MAP
        select PINCTRL
        select ARCH_REQUIRE_GPIOLIB
-       select ARCH_HAS_OPP
 
 if ARCH_SHMOBILE_MULTI
 
@@ -73,11 +74,6 @@ config ARCH_R8A7794
 
 comment "Renesas ARM SoCs Board Type"
 
-config MACH_KOELSCH
-       bool "Koelsch board"
-       depends on ARCH_R8A7791
-       select MICREL_PHY if SH_ETH
-
 config MACH_LAGER
        bool "Lager board"
        depends on ARCH_R8A7790
@@ -145,14 +141,6 @@ config ARCH_R8A7790
        select MIGHT_HAVE_PCI
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
-config ARCH_R8A7791
-       bool "R-Car M2-W (R8A77910)"
-       select ARCH_RCAR_GEN2
-       select ARCH_WANT_OPTIONAL_GPIOLIB
-       select ARM_GIC
-       select MIGHT_HAVE_PCI
-       select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-
 comment "Renesas ARM SoCs Board Type"
 
 config MACH_APE6EVM
@@ -227,12 +215,6 @@ config MACH_LAGER
        select MICREL_PHY if SH_ETH
        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
-config MACH_KOELSCH
-       bool "Koelsch board"
-       depends on ARCH_R8A7791
-       select USE_OF
-       select MICREL_PHY if SH_ETH
-
 config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0