diff options
author | Russell King | 2009-06-08 20:27:13 +0200 |
---|---|---|
committer | Russell King | 2009-06-08 20:27:13 +0200 |
commit | 7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch) | |
tree | 207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /arch/arm/Kconfig | |
parent | Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ... (diff) | |
parent | [ARM] Kirkwood: platform device registration for the crypto engine (diff) | |
download | kernel-qcow2-linux-7698fdedcfa3cab3dd40c9b685590b23be02e267.tar.gz kernel-qcow2-linux-7698fdedcfa3cab3dd40c9b685590b23be02e267.tar.xz kernel-qcow2-linux-7698fdedcfa3cab3dd40c9b685590b23be02e267.zip |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 28248b5d6a70..646a5d5eb8c1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -394,6 +394,7 @@ config ARCH_KIRKWOOD select CPU_FEROCEON select PCI select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION @@ -415,6 +416,7 @@ config ARCH_MV78XX0 select CPU_FEROCEON select PCI select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION @@ -428,6 +430,7 @@ config ARCH_ORION5X select CPU_FEROCEON select PCI select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION |