diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:56:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:56:23 +0200 |
| commit | 7b2ac875befbc502a172e5539f22bc5bef0d524f (patch) | |
| tree | fe71266f5fba8c48bae671a423b44826607b9975 /arch/arm/Kconfig | |
| parent | 306df04e330bfa0f96bc49fc16db32084fa960f5 (diff) | |
| parent | 4d09a938861ef16248334d57ae250e109b0004ae (diff) | |
Merge branch 'next/devel' into for-next
Conflicts:
arch/arm/mach-davinci/include/mach/psc.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d290703a687..7bb4735033c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -321,7 +321,7 @@ config ARCH_CLPS711X config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" - select CPU_V6 + select CPU_V6K select GENERIC_CLOCKEVENTS select ARM_GIC select MIGHT_HAVE_PCI @@ -389,6 +389,7 @@ config ARCH_MXC select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select GENERIC_IRQ_CHIP select HAVE_SCHED_CLOCK help Support for Freescale MXC/iMX-based family of processors @@ -604,7 +605,6 @@ config ARCH_TEGRA select GENERIC_GPIO select HAVE_CLK select HAVE_SCHED_CLOCK - select ARCH_HAS_BARRIERS if CACHE_L2X0 select ARCH_HAS_CPUFREQ help This enables support for NVIDIA Tegra based systems (Tegra APX, @@ -631,6 +631,8 @@ config ARCH_PXA select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select AUTO_ZRELADDR + select MULTI_IRQ_HANDLER help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |