diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-17 20:26:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-17 20:26:48 +0200 |
commit | b93fc1d2a6f6f5fe6127bf40979117ddc333d504 (patch) | |
tree | 6b9f8cd036eccb409a4ed7a63c238ba965829c7e /kernel-aarch64-debug.config | |
parent | 322556ccde90965b4319c349a4bad7810adb3a08 (diff) | |
parent | 3986999a48a7b1279e3b1e407f7aad00b337a3ad (diff) | |
download | kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.tar.gz kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.tar.xz kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-aarch64-debug.config')
-rw-r--r-- | kernel-aarch64-debug.config | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 861ea2bd0..8c903c49b 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3804,6 +3804,7 @@ CONFIG_NR_CPUS=256 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4267,6 +4268,7 @@ CONFIG_RADIO_TERRATEC=m CONFIG_RADIO_TRUST=m CONFIG_RADIO_TYPHOON=m CONFIG_RADIO_WL1273=m +CONFIG_RADIO_WL128X=m CONFIG_RADIO_ZOLTRIX=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set @@ -5573,6 +5575,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5631,7 +5634,7 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y # CONFIG_TI_SCI_CLK is not set CONFIG_TI_SCI_PROTOCOL=m -# CONFIG_TI_ST is not set +CONFIG_TI_ST=m # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set CONFIG_TLS=m @@ -6363,6 +6366,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set |