diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-20 17:40:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-20 17:40:03 +0000 |
| commit | a663a71e429d7d06a7773edc4092995c5fe1171f (patch) | |
| tree | 3a9e4b3a00754c8d4207fd6e4c310e53879d9772 /arch/arm/Kconfig | |
| parent | 828aac2ee239dca9c1856c4856a57912e6a487c4 (diff) | |
| parent | b95a13d79c0e92c9c844fa8aa089c9bd2ed10705 (diff) | |
| download | linux-3.10-a663a71e429d7d06a7773edc4092995c5fe1171f.tar.gz linux-3.10-a663a71e429d7d06a7773edc4092995c5fe1171f.tar.bz2 linux-3.10-a663a71e429d7d06a7773edc4092995c5fe1171f.zip | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4f870207f49..d6ebe39934b 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 |