diff options
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index acd12efe6f3e..8928b21a2dba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -7,7 +7,6 @@ config ARM | |||
| 7 | select HAVE_IDE if PCI || ISA || PCMCIA | 7 | select HAVE_IDE if PCI || ISA || PCMCIA |
| 8 | select HAVE_DMA_ATTRS | 8 | select HAVE_DMA_ATTRS |
| 9 | select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7) | 9 | select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7) |
| 10 | select CMA if (CPU_V6 || CPU_V6K || CPU_V7) | ||
| 11 | select HAVE_MEMBLOCK | 10 | select HAVE_MEMBLOCK |
| 12 | select RTC_LIB | 11 | select RTC_LIB |
| 13 | select SYS_SUPPORTS_APM_EMULATION | 12 | select SYS_SUPPORTS_APM_EMULATION |
| @@ -297,6 +296,7 @@ config ARCH_VERSATILE | |||
| 297 | select ICST | 296 | select ICST |
| 298 | select GENERIC_CLOCKEVENTS | 297 | select GENERIC_CLOCKEVENTS |
| 299 | select ARCH_WANT_OPTIONAL_GPIOLIB | 298 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 299 | select NEED_MACH_IO_H if PCI | ||
| 300 | select PLAT_VERSATILE | 300 | select PLAT_VERSATILE |
| 301 | select PLAT_VERSATILE_CLCD | 301 | select PLAT_VERSATILE_CLCD |
| 302 | select PLAT_VERSATILE_FPGA_IRQ | 302 | select PLAT_VERSATILE_FPGA_IRQ |
| @@ -592,6 +592,7 @@ config ARCH_ORION5X | |||
| 592 | select PCI | 592 | select PCI |
| 593 | select ARCH_REQUIRE_GPIOLIB | 593 | select ARCH_REQUIRE_GPIOLIB |
| 594 | select GENERIC_CLOCKEVENTS | 594 | select GENERIC_CLOCKEVENTS |
| 595 | select NEED_MACH_IO_H | ||
| 595 | select PLAT_ORION | 596 | select PLAT_ORION |
| 596 | help | 597 | help |
| 597 | Support for the following Marvell Orion 5x series SoCs: | 598 | Support for the following Marvell Orion 5x series SoCs: |