Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 074bc21..ba75e36 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,7 +7,6 @@ config ARM
        select ARCH_HAS_BINFMT_FLAT
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DEVMEM_IS_ALLOWED
-       select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
        select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FORTIFY_SOURCE
@@ -117,7 +116,6 @@ config ARM
        select OLD_SIGSUSPEND3
        select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC
-       select REFCOUNT_FULL
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        # Above selects are sorted alphabetically; please add new ones
@@ -1020,7 +1018,7 @@ config ARM_ERRATA_775420
        depends on CPU_V7
        help
         This option enables the workaround for the 775420 Cortex-A9 (r2p2,
-        r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
+        r2p6,r2p8,r2p10,r3p0) erratum. In case a data cache maintenance
         operation aborts with MMU exception, it might cause the processor
         to deadlock. This workaround puts DSB before executing ISB if
         an abort may occur on cache maintenance.