diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 19:02:21 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 19:02:21 (GMT) |
| commit | 94a2597c01a4bd495789e1546374c26b19f6eafd (patch) | |
| tree | 5dd2a82f89a6a8c093d4d6ab7aee22173ff9233e /arch/arm/Kconfig | |
| parent | a01fcf3426df3f782d592bd010d93c61a0d70cb9 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| download | linux-94a2597c01a4bd495789e1546374c26b19f6eafd.tar.xz | |
Merge tag 'v3.5-rc5' into next/dt
Linux 3.5-rc5
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 e86fe20..8b0b743 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -293,6 +293,7 @@ config ARCH_VERSATILE select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB + select NEED_MACH_IO_H if PCI select PLAT_VERSATILE select PLAT_VERSATILE_CLCD select PLAT_VERSATILE_FPGA_IRQ @@ -588,6 +589,7 @@ config ARCH_ORION5X select PCI select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS + select NEED_MACH_IO_H select PLAT_ORION help Support for the following Marvell Orion 5x series SoCs: |