diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 23:28:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 23:28:06 +0200 |
| commit | 4338925434e4bf5ff714055713f3fb9b5fae9037 (patch) | |
| tree | 2c764e61af011f71b97c1d4b5113b47265d3e03d /arch/arm/Kconfig | |
| parent | Merge tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: Kirkwood: Remove mach-kirkwood (diff) | |
| download | linux-4338925434e4bf5ff714055713f3fb9b5fae9037.tar.xz linux-4338925434e4bf5ff714055713f3fb9b5fae9037.zip | |
Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc
Merge "ARM: mvebu SoC changes for v3.17 (round 2)" from Jason Cooper:
"Yeah, it's just one patch, but it's a beautiful one! Thanks to the
efforts of many people over the last couple years, and in particular,
Andrew Lunn, Kirkwood has been completely converted to DT."
- kirkwood
* Remove mach-kirkwood/, It's fully supported in mach-mvebu/
* tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu:
ARM: Kirkwood: Remove mach-kirkwood
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 245058b3b0ef..ba536bcb91b3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -528,21 +528,6 @@ config ARCH_DOVE help Support for the Marvell Dove SoC 88AP510 -config ARCH_KIRKWOOD - bool "Marvell Kirkwood" - select ARCH_REQUIRE_GPIOLIB - select CPU_FEROCEON - select GENERIC_CLOCKEVENTS - select MVEBU_MBUS - select PCI - select PCI_QUIRKS - select PINCTRL - select PINCTRL_KIRKWOOD - select PLAT_ORION_LEGACY - help - Support for the following Marvell Kirkwood series SoCs: - 88F6180, 88F6192 and 88F6281. - config ARCH_MV78XX0 bool "Marvell MV78xx0" select ARCH_REQUIRE_GPIOLIB @@ -951,8 +936,6 @@ source "arch/arm/mach-ixp4xx/Kconfig" source "arch/arm/mach-keystone/Kconfig" -source "arch/arm/mach-kirkwood/Kconfig" - source "arch/arm/mach-ks8695/Kconfig" source "arch/arm/mach-msm/Kconfig" |