diff options
| author | Arnd Bergmann | 2016-03-01 00:24:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2016-03-01 00:24:43 +0100 |
| commit | 1c277cae146b7c3aec0c6ee26dcc4086601a5bca (patch) | |
| tree | d5be2e2308e15979d30ab7e691fea2b35873c535 /arch/arm/Kconfig | |
| parent | Merge tag 'sunxi-core-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | dmaengine: pxa_dma: fix the maximum requestor line (diff) | |
| download | kernel-qcow2-linux-1c277cae146b7c3aec0c6ee26dcc4086601a5bca.tar.gz kernel-qcow2-linux-1c277cae146b7c3aec0c6ee26dcc4086601a5bca.tar.xz kernel-qcow2-linux-1c277cae146b7c3aec0c6ee26dcc4086601a5bca.zip | |
Merge tag 'pxa-for-4.6' of https://github.com/rjarzmik/linux into next/soc
Merge "pxa changes for v4.6 cycle" from Robert Jarzmik:
This is a minor cycle with :
- cleanup fixes from Arnd, mainly build oriented and sparse type ones
- dma fixes for requestors above 32 (impacting mainly camera driver)
- some minor cleanup on pxa3xx device-tree side
* tag 'pxa-for-4.6' of https://github.com/rjarzmik/linux:
dmaengine: pxa_dma: fix the maximum requestor line
ARM: pxa: add the number of DMA requestor lines
dmaengine: mmp-pdma: add number of requestors
dma: mmp_pdma: Add the #dma-requests DT property documentation
ARM: pxa: pxa3xx device-tree support cleanup
ARM: pxa: don't select RFKILL if CONFIG_NET is disabled
ARM: pxa: fix building without IWMMXT
ARM: pxa: move extern declarations to pm.h
ARM: pxa: always select one of the two CPU types
ARM: pxa: don't select GPIO_SYSFS for MIOA701
ARM: pxa: mark unused eseries code as __maybe_unused
ARM: pxa: mark spitz_card_pwr_ctrl as __maybe_unused
ARM: pxa: define clock registers as __iomem
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7c5920fdcbbd..2747202e3c4c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -547,6 +547,7 @@ config ARCH_PXA select CLKSRC_PXA select CLKSRC_MMIO select CLKSRC_OF + select CPU_XSCALE if !CPU_XSC3 select GENERIC_CLOCKEVENTS select GPIO_PXA select HAVE_IDE |