summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-20 09:27:05 +0400
committerOlof Johansson <olof@lixom.net>2014-05-20 10:29:01 +0400
commit5fe0163aea863b1a5f79173619fdfe9e9baad299 (patch)
treec49a6f58a3d3d71825cf77477e1e2702d2ffe103 /arch/arm/mach-mvebu/Kconfig
parent5df22a6148d7f073513a61eb306a98654c5a6fe8 (diff)
parente7062b101537a0c4f4a8d725321772eb78100074 (diff)
downloadlinux-5fe0163aea863b1a5f79173619fdfe9e9baad299.tar.xz
Merge branch 'cleanup/kconfig' into next/soc
Bring in the cleanup branch due to conflicts in new additions. Should really have been the base before the other branch, but this way works too. * cleanup/kconfig: ARM: qcom: clean-up unneeded kconfig selects ARM: bcm: clean-up unneeded kconfig selects ARM: mvebu: clean-up unneeded kconfig selects Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
-rw-r--r--arch/arm/mach-mvebu/Kconfig6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index d6b0a772a6dd..199187e474ce 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -3,7 +3,6 @@ config ARCH_MVEBU
select ARCH_SUPPORTS_BIG_ENDIAN
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
- select IRQ_DOMAIN
select PINCTRL
select PLAT_ORION
select SOC_BUS
@@ -12,7 +11,6 @@ config ARCH_MVEBU
select ARCH_REQUIRE_GPIOLIB
select MIGHT_HAVE_PCI
select PCI_QUIRKS if PCI
- select OF_ADDRESS_PCI
if ARCH_MVEBU
@@ -39,7 +37,6 @@ config MACH_ARMADA_375
select ARM_ERRATA_753970
select ARM_GIC
select ARMADA_375_CLK
- select CPU_V7
select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP
select HAVE_SMP
@@ -55,7 +52,6 @@ config MACH_ARMADA_38X
select ARM_ERRATA_753970
select ARM_GIC
select ARMADA_38X_CLK
- select CPU_V7
select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP
select HAVE_SMP
@@ -93,13 +89,11 @@ config MACH_KIRKWOOD
select ARCH_REQUIRE_GPIOLIB
select CPU_FEROCEON
select KIRKWOOD_CLK
- select OF_IRQ
select ORION_IRQCHIP
select ORION_TIMER
select PCI
select PCI_QUIRKS
select PINCTRL_KIRKWOOD
- select USE_OF
help
Say 'Y' here if you want your kernel to support boards based
on the Marvell Kirkwood device tree.