diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-27 14:48:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-27 14:48:26 +0200 |
| commit | aef4762a6251b17b054686e725cebfa644dd3458 (patch) | |
| tree | a8770bbd35a6d2154750d4d500ed5ee2ffc9a03e /kernel-aarch64.config | |
| parent | 14577d40d92138ce687a487430419effe680a33d (diff) | |
| parent | 9c8eca505311b83a28acf0712c71dae6cf1f7960 (diff) | |
| download | kernel-aef4762a6251b17b054686e725cebfa644dd3458.tar.gz kernel-aef4762a6251b17b054686e725cebfa644dd3458.tar.xz kernel-aef4762a6251b17b054686e725cebfa644dd3458.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc1.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc1.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc1.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc1.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-aarch64.config')
| -rw-r--r-- | kernel-aarch64.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c09801918..5a1bf0d66 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4818,6 +4818,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y CONFIG_RESET_HISI=y # CONFIG_RESET_HSDK_V1 is not set +# CONFIG_RESET_MESON_AUDIO_ARB is not set # CONFIG_RESET_QCOM_AOSS is not set CONFIG_RESET_SIMPLE=y # CONFIG_RESET_TI_SCI is not set @@ -6129,6 +6130,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_IDA is not set # CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set |