diff options
| author | Olof Johansson | 2012-09-22 22:22:21 +0200 |
|---|---|---|
| committer | Olof Johansson | 2012-09-22 22:22:21 +0200 |
| commit | 80868a36913e11cfcd06764699b4284d34be0e59 (patch) | |
| tree | af4c634ccde4c0b4b7bf361e53611ab9903d1a2c /arch/arm/Kconfig | |
| parent | Merge branch 'next/multiplatform' into late/kirkwood (diff) | |
| parent | ARM: Dove: allow PCI to be disabled (diff) | |
| download | kernel-qcow2-linux-80868a36913e11cfcd06764699b4284d34be0e59.tar.gz kernel-qcow2-linux-80868a36913e11cfcd06764699b4284d34be0e59.tar.xz kernel-qcow2-linux-80868a36913e11cfcd06764699b4284d34be0e59.zip | |
Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
* 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux:
ARM: Dove: allow PCI to be disabled
ARM: dove: SolidRun CuBox DT
ARM: dove: add device tree descriptors
ARM: dove: add device tree based machine descriptor
ARM: dove: add crypto engine
ARM: dove: add clock gating control
ARM: dove: unify clock setup
ARM: initial DTS support for km_kirkwood
arm: add documentation describing Marvell families of SoC
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: Kirkwood: Iomega ix2-200 DT support
Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c.
The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are
kept and dealt with in a separate changeset, since moving them out to
the new Makefile in this merge commit doesn't work well.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f416422ddb0e..5876aef72dfe 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -537,10 +537,11 @@ config ARCH_IXP4XX config ARCH_DOVE bool "Marvell Dove" select CPU_V7 - select PCI select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_PCI select PLAT_ORION + select USB_ARCH_HAS_EHCI help Support for the Marvell Dove SoC 88AP510 |