diff options
author | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /arch/tile/Kconfig | |
parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) | |
download | linux-stable-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.gz linux-stable-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.bz2 linux-stable-7e3b1207705c10ada363bbc7d0235730ce1f5b79.zip |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'arch/tile/Kconfig')
-rw-r--r-- | arch/tile/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 8ec7a4599c08..de4a4fff9323 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -5,7 +5,6 @@ config TILE def_bool y select HAVE_PERF_EVENTS select USE_PMC if PERF_EVENTS - select HAVE_DMA_ATTRS select HAVE_DMA_API_DEBUG select HAVE_KVM if !TILEGX select GENERIC_FIND_FIRST_BIT @@ -19,6 +18,7 @@ config TILE select VIRT_TO_BUS select SYS_HYPERVISOR select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_CLOCKEVENTS select MODULES_USE_ELF_RELA @@ -116,9 +116,6 @@ config ARCH_DISCONTIGMEM_DEFAULT config TRACE_IRQFLAGS_SUPPORT def_bool y -config STRICT_DEVMEM - def_bool y - # SMP is required for Tilera Linux. config SMP def_bool y @@ -143,6 +140,7 @@ config TILEGX select HAVE_KRETPROBES select HAVE_ARCH_KGDB select ARCH_SUPPORTS_ATOMIC_RMW + select HAVE_ARCH_JUMP_LABEL config TILEPRO def_bool !TILEGX |