diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-10 20:36:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-10 20:36:01 +0200 |
commit | 12566869d34f107fe1903ac60dac8d938d892068 (patch) | |
tree | 2afbb8624e555d2f2ca64d61a86c81335e3a87cf /kernel-aarch64-debug.config | |
parent | c7f1223e08e38f9dbb90bea031200f07a84c4b01 (diff) | |
parent | 09179817b637d651398bbe275109102221c8235d (diff) | |
download | kernel-12566869d34f107fe1903ac60dac8d938d892068.tar.gz kernel-12566869d34f107fe1903ac60dac8d938d892068.tar.xz kernel-12566869d34f107fe1903ac60dac8d938d892068.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-aarch64-debug.config')
-rw-r--r-- | kernel-aarch64-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 44fefa8d1..c1cd3f2d8 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1181,10 +1181,10 @@ CONFIG_DL2K=m CONFIG_DLM_DEBUG=y CONFIG_DLM=m CONFIG_DM9102=m -CONFIG_DMA_API_DEBUG=y +# CONFIG_DMA_API_DEBUG is not set CONFIG_DMA_BCM2835=m CONFIG_DMA_CMA=y -CONFIG_DMADEVICES_DEBUG=y +# CONFIG_DMADEVICES_DEBUG is not set # CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y |