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-i686-PAE.config | |
parent | 75f8db1318522e91b0ab3820bbce97fe1f0e8f63 (diff) | |
parent | f43033cacbc89eabe372a7606c493e99d7d99314 (diff) | |
download | kernel-2200e4f86707cbbbfac0d0fb2f7bb1822500b592.tar.gz kernel-2200e4f86707cbbbfac0d0fb2f7bb1822500b592.tar.xz kernel-2200e4f86707cbbbfac0d0fb2f7bb1822500b592.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-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 465adddc7..404f38acd 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1032,6 +1032,8 @@ CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m # CONFIG_DELL_RBU is not set CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_SMM=m +CONFIG_DELL_SMBIOS_WMI=m CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m @@ -1675,6 +1677,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 @@ -1886,7 +1889,7 @@ CONFIG_HW_RANDOM_TPM=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM=y -CONFIG_HWSPINLOCK=m +CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m CONFIG_HYPERVISOR_GUEST=y @@ -2196,6 +2199,7 @@ CONFIG_INTEL_SOC_PMIC=y # CONFIG_INTEL_TH is not set # CONFIG_INTEL_TXT is not set CONFIG_INTEL_VBTN=m +CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_INV_MPU6050_I2C is not set @@ -3738,6 +3742,7 @@ CONFIG_NSC_FIR=m CONFIG_NSC_GPIO=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_NUMA is not set @@ -4229,6 +4234,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 @@ -4853,7 +4859,7 @@ CONFIG_SND_AU8830=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_BEBOB=m CONFIG_SND_BT87X=m # CONFIG_SND_BT87X_OVERCLOCK is not set @@ -5337,6 +5343,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 |