diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-02 19:29:56 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-02 19:29:56 +0100 |
commit | eeb02ab1254c199a785ccd8bbe350d50f12598c6 (patch) | |
tree | c6cf6b84d34fba8cba8135b57e7ee3c42d3ee973 /kernel-aarch64.config | |
parent | 6c1f95521905c276119057698934aa59e19893a3 (diff) | |
parent | 6cabd1334689126c94c0bd1e8b06e320f413f340 (diff) | |
download | kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc27.tar.gz kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc27.tar.xz kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git8.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-aarch64.config')
-rw-r--r-- | kernel-aarch64.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 385a26776..be12e2d7c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6195,7 +6195,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_WARN is not set -CONFIG_XGENE_DMA=m +# CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y CONFIG_XGENE_SLIMPRO_MBOX=m # CONFIG_XILINX_DMA is not set |