diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-20 12:40:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-20 12:40:03 -0500 |
| commit | a663a71e429d7d06a7773edc4092995c5fe1171f (patch) | |
| tree | 3a9e4b3a00754c8d4207fd6e4c310e53879d9772 /arch/arm/Kconfig | |
| parent | 828aac2ee239dca9c1856c4856a57912e6a487c4 (diff) | |
| parent | b95a13d79c0e92c9c844fa8aa089c9bd2ed10705 (diff) | |
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 4f870207f496..d6ebe39934b5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -387,6 +387,7 @@ config ARCH_KIRKWOOD | |||
| 387 | bool "Marvell Kirkwood" | 387 | bool "Marvell Kirkwood" |
| 388 | select CPU_FEROCEON | 388 | select CPU_FEROCEON |
| 389 | select PCI | 389 | select PCI |
| 390 | select GENERIC_GPIO | ||
| 390 | select GENERIC_TIME | 391 | select GENERIC_TIME |
| 391 | select GENERIC_CLOCKEVENTS | 392 | select GENERIC_CLOCKEVENTS |
| 392 | select PLAT_ORION | 393 | select PLAT_ORION |
| @@ -429,6 +430,7 @@ config ARCH_MV78XX0 | |||
| 429 | bool "Marvell MV78xx0" | 430 | bool "Marvell MV78xx0" |
| 430 | select CPU_FEROCEON | 431 | select CPU_FEROCEON |
| 431 | select PCI | 432 | select PCI |
| 433 | select GENERIC_GPIO | ||
| 432 | select GENERIC_TIME | 434 | select GENERIC_TIME |
| 433 | select GENERIC_CLOCKEVENTS | 435 | select GENERIC_CLOCKEVENTS |
| 434 | select PLAT_ORION | 436 | select PLAT_ORION |