diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:02:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:56:18 +0100 |
| commit | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (patch) | |
| tree | fbc59ebf82556cd604b1946304c61e64c4469caf /arch/arm/Kconfig | |
| parent | 7379d96bdabdfb2bf619c174fb6160a9c0a00ca3 (diff) | |
| parent | 5420b4b156179ec634d9e42279b6898b85852960 (diff) | |
| download | linux-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.tar.bz2 | |
Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform
Merge "Realview multiplatform support" from Linus Walleij:
The board and infrastructure changes for RealView
multiplatform and extended DT support.
* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: add an DT SMP boot method
ARM: realview: select SP810 and ICST for the DT variant
soc: versatile: add support for the PB11MPCore
clk: versatile-icst: add device tree support
clk: versatile-icst: refactor to allocate regmap separately
clk: versatile-icst: convert to use regmap
ARM: realview: remove private barrier implementation
ARM: no longer force unbuffered DMA for realview
clk/realview: stop using machine headers
ARM: realview: don't map undefined PCI registers
ARM: realview: remove sparsemem hack
Conflicts:
drivers/clk/versatile/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index aebe283a4275..70eb100b56e7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -241,7 +241,6 @@ config ARM_PATCH_PHYS_VIRT bool "Patch physical to virtual translations at runtime" if EMBEDDED default y depends on !XIP_KERNEL && MMU - depends on !ARCH_REALVIEW || !SPARSEMEM help Patch phys-to-virt and virt-to-phys translation functions at boot and module load time according to the position of the @@ -356,7 +355,6 @@ config ARCH_REALVIEW select GENERIC_CLOCKEVENTS select GPIO_PL061 if GPIOLIB select ICST - select NEED_MACH_MEMORY_H select PLAT_VERSATILE select PLAT_VERSATILE_SCHED_CLOCK help |