summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-20 17:40:03 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-20 17:40:03 +0000
commita663a71e429d7d06a7773edc4092995c5fe1171f (patch)
tree3a9e4b3a00754c8d4207fd6e4c310e53879d9772 /arch/arm/Kconfig
parent828aac2ee239dca9c1856c4856a57912e6a487c4 (diff)
parentb95a13d79c0e92c9c844fa8aa089c9bd2ed10705 (diff)
downloadlinux-a663a71e429d7d06a7773edc4092995c5fe1171f.tar.bz2
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4f870207f496..d6ebe39934b5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -387,6 +387,7 @@ config ARCH_KIRKWOOD
bool "Marvell Kirkwood"
select CPU_FEROCEON
select PCI
+ select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select PLAT_ORION
@@ -429,6 +430,7 @@ config ARCH_MV78XX0
bool "Marvell MV78xx0"
select CPU_FEROCEON
select PCI
+ select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select PLAT_ORION