diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-08 14:27:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-08 14:27:13 -0400 |
| commit | 7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch) | |
| tree | 207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /arch/arm/Kconfig | |
| parent | 2d8d24935d372175786ebefa8a2de8680831b67f (diff) | |
| parent | ae5c8c83735f5fcb09b380944e4854a383006998 (diff) | |
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 | |||
| 394 | select CPU_FEROCEON | 394 | select CPU_FEROCEON |
| 395 | select PCI | 395 | select PCI |
| 396 | select GENERIC_GPIO | 396 | select GENERIC_GPIO |
| 397 | select ARCH_REQUIRE_GPIOLIB | ||
| 397 | select GENERIC_TIME | 398 | select GENERIC_TIME |
| 398 | select GENERIC_CLOCKEVENTS | 399 | select GENERIC_CLOCKEVENTS |
| 399 | select PLAT_ORION | 400 | select PLAT_ORION |
| @@ -415,6 +416,7 @@ config ARCH_MV78XX0 | |||
| 415 | select CPU_FEROCEON | 416 | select CPU_FEROCEON |
| 416 | select PCI | 417 | select PCI |
| 417 | select GENERIC_GPIO | 418 | select GENERIC_GPIO |
| 419 | select ARCH_REQUIRE_GPIOLIB | ||
| 418 | select GENERIC_TIME | 420 | select GENERIC_TIME |
| 419 | select GENERIC_CLOCKEVENTS | 421 | select GENERIC_CLOCKEVENTS |
| 420 | select PLAT_ORION | 422 | select PLAT_ORION |
| @@ -428,6 +430,7 @@ config ARCH_ORION5X | |||
| 428 | select CPU_FEROCEON | 430 | select CPU_FEROCEON |
| 429 | select PCI | 431 | select PCI |
| 430 | select GENERIC_GPIO | 432 | select GENERIC_GPIO |
| 433 | select ARCH_REQUIRE_GPIOLIB | ||
| 431 | select GENERIC_TIME | 434 | select GENERIC_TIME |
| 432 | select GENERIC_CLOCKEVENTS | 435 | select GENERIC_CLOCKEVENTS |
| 433 | select PLAT_ORION | 436 | select PLAT_ORION |