diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
| commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
| tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/Kconfig | |
| parent | f015941f6b4a7d4d90c46a65bca17f2c2c41fb89 (diff) | |
| parent | f7c66dc0bf0f4ecd349c79315c87841c67e27aef (diff) | |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 42ee64e68c4..b70ee954f69 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -393,6 +393,7 @@ config ARCH_GEMINI config ARCH_SIRF bool "CSR SiRF" select ARCH_REQUIRE_GPIOLIB + select AUTO_ZRELADDR select COMMON_CLK select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP @@ -642,6 +643,7 @@ config ARCH_TEGRA select ARCH_HAS_CPUFREQ select CLKDEV_LOOKUP select CLKSRC_MMIO + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select GENERIC_GPIO @@ -951,22 +953,6 @@ config ARCH_OMAP help Support for TI's OMAP platform (OMAP1/2/3/4). -config ARCH_VT8500_SINGLE - bool "VIA/WonderMedia 85xx" - select ARCH_HAS_CPUFREQ - select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP - select COMMON_CLK - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select GENERIC_GPIO - select HAVE_CLK - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select USE_OF - help - Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. - endchoice menu "Multiple platform selection" |