diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-08 07:43:09 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-08 07:43:09 +0200 |
commit | 39e41033257e11d25de77339390d91f3b5db66f6 (patch) | |
tree | bad94e43c1e51b51d58fcc6c6c737a142c31c27e /config-arm64 | |
parent | fdd04f2e2f251e0eaf68d07e13c8747c2831b71e (diff) | |
parent | 4447ea8ed00a441be09779b5ef3ed5b8cdafc1ad (diff) | |
download | kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc24.tar.gz kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc24.tar.xz kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc0.git4.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-arm64')
-rw-r--r-- | config-arm64 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm64 b/config-arm64 index 87794ec99..ffeb80130 100644 --- a/config-arm64 +++ b/config-arm64 @@ -176,6 +176,7 @@ CONFIG_DRM_HISI_KIRIN=m CONFIG_HISI_KIRIN_DW_DSI=m CONFIG_MDIO_HISI_FEMAC=m CONFIG_INPUT_HISI_POWERKEY=m +# CONFIG_K3_DMA is not set # Tegra CONFIG_ARCH_TEGRA_132_SOC=y @@ -269,6 +270,7 @@ CONFIG_QCOM_COINCELL=m # CONFIG_CHARGER_MANAGER is not set # CONFIG_SENSORS_LTC2978_REGULATOR is not set # CONFIG_QCOM_Q6V5_PIL is not set +# CONFIG_QCOM_WCNSS_PIL is not set # mvebu # CONFIG_MV_XOR_V2 is not set |