diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-21 07:25:33 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-21 07:25:33 +0100 |
commit | 2200e4f86707cbbbfac0d0fb2f7bb1822500b592 (patch) | |
tree | 8c5d7c88a5204d9f591a81d142d98431e229477c /kernel-armv7hl-lpae-debug.config | |
parent | 75f8db1318522e91b0ab3820bbce97fe1f0e8f63 (diff) | |
parent | f43033cacbc89eabe372a7606c493e99d7d99314 (diff) | |
download | kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.tar.gz kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.tar.xz kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 8e7bb137b..5bf7bc358 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1843,6 +1843,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m +# CONFIG_GUP_BENCHMARK is not set CONFIG_HAMACHI=m CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m @@ -2047,7 +2048,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM=y -CONFIG_HWSPINLOCK=m +CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYSDN_CAPI=y CONFIG_HYSDN=m @@ -3948,6 +3949,7 @@ CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NTB_IDT=m # CONFIG_NTB is not set +CONFIG_NTB_SWITCHTEC=m # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y CONFIG_NVME_FC=m @@ -4560,6 +4562,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +CONFIG_RPMSG_VIRTIO=m CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5207,7 +5210,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m -# CONFIG_SND_BCD2000 is not set +CONFIG_SND_BCD2000=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_BEBOB=m CONFIG_SND_BT87X=m @@ -5771,6 +5774,7 @@ CONFIG_TERANETICS_PHY=m CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIND_BIT is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set |