summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-01 18:22:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-01 18:22:54 +0000
commitd7931d9f7ab9de9158c6905caae979999134ad4d (patch)
tree3903d96bfea61a4c66b11f95535928b4cb991327 /arch/arm/Kconfig
parentfb3704663058ebb8ec05236f9c984b702550bac5 (diff)
parentda43243e765908d2ce6d22b2be995edf3218457d (diff)
downloadlinux-3.10-d7931d9f7ab9de9158c6905caae979999134ad4d.tar.gz
linux-3.10-d7931d9f7ab9de9158c6905caae979999134ad4d.tar.bz2
linux-3.10-d7931d9f7ab9de9158c6905caae979999134ad4d.zip
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 455284edda2..62152ae3475 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -433,6 +433,17 @@ config ARCH_L7200
If you have any questions or comments about the Linux kernel port
to this board, send e-mail to <sjhill@cotw.com>.
+config ARCH_DOVE
+ bool "Marvell Dove"
+ select PCI
+ select GENERIC_GPIO
+ select ARCH_REQUIRE_GPIOLIB
+ select GENERIC_TIME
+ select GENERIC_CLOCKEVENTS
+ select PLAT_ORION
+ help
+ Support for the Marvell Dove SoC 88AP510
+
config ARCH_KIRKWOOD
bool "Marvell Kirkwood"
select CPU_FEROCEON
@@ -747,6 +758,8 @@ source "arch/arm/mach-orion5x/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
+source "arch/arm/mach-dove/Kconfig"
+
source "arch/arm/plat-s3c24xx/Kconfig"
source "arch/arm/plat-s3c64xx/Kconfig"
source "arch/arm/plat-s3c/Kconfig"