diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-27 15:38:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-27 15:38:32 +1100 |
| commit | fe39525d433eaacbd541657647a10cbd55da28c9 (patch) | |
| tree | 0df7380ded925d75496dce3fe205e89cc3fd7c57 /arch/Kconfig | |
| parent | 2a3695d7cd189a1cef337e44fe69094d75857fed (diff) | |
| parent | b5eeb4510709477632630ab5a05ec914ff2ae503 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 141823f19a8b..3841ea204a4f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -205,9 +205,6 @@ config HAVE_NMI_WATCHDOG config HAVE_ARCH_TRACEHOOK bool -config HAVE_DMA_ATTRS - bool - config HAVE_DMA_CONTIGUOUS bool @@ -628,4 +625,7 @@ config OLD_SIGACTION config COMPAT_OLD_SIGACTION bool +config ARCH_NO_COHERENT_DMA_MMAP + bool + source "kernel/gcov/Kconfig" |