diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 06:50:20 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 06:50:20 -0400 |
| commit | 0dc19510430b20b3b2d6d1b9b796fd42fa2af64a (patch) | |
| tree | a512cf400d74d72272ce6cf5c4d782538213d433 /arch/arm/Kconfig | |
| parent | b52a2c472d7fcf215e31dffdd382651e1b99f138 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into next/soc
Linux 3.5-rc6
Dependency for imx/soc changes
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 e86fe20b7d09..8b0b743b4fb1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -293,6 +293,7 @@ config ARCH_VERSATILE | |||
| 293 | select ICST | 293 | select ICST |
| 294 | select GENERIC_CLOCKEVENTS | 294 | select GENERIC_CLOCKEVENTS |
| 295 | select ARCH_WANT_OPTIONAL_GPIOLIB | 295 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 296 | select NEED_MACH_IO_H if PCI | ||
| 296 | select PLAT_VERSATILE | 297 | select PLAT_VERSATILE |
| 297 | select PLAT_VERSATILE_CLCD | 298 | select PLAT_VERSATILE_CLCD |
| 298 | select PLAT_VERSATILE_FPGA_IRQ | 299 | select PLAT_VERSATILE_FPGA_IRQ |
| @@ -588,6 +589,7 @@ config ARCH_ORION5X | |||
| 588 | select PCI | 589 | select PCI |
| 589 | select ARCH_REQUIRE_GPIOLIB | 590 | select ARCH_REQUIRE_GPIOLIB |
| 590 | select GENERIC_CLOCKEVENTS | 591 | select GENERIC_CLOCKEVENTS |
| 592 | select NEED_MACH_IO_H | ||
| 591 | select PLAT_ORION | 593 | select PLAT_ORION |
| 592 | help | 594 | help |
| 593 | Support for the following Marvell Orion 5x series SoCs: | 595 | Support for the following Marvell Orion 5x series SoCs: |