diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-12 15:15:41 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-12 15:15:41 +0200 |
commit | 31a291653a8222da7dd2f25077552b273c4d87f2 (patch) | |
tree | af0a8ad0839bbc579a6a9cdd5ed9a8112a717d74 /kernel-i686.config | |
parent | 3cdbb27722270953aa437a93cda98ea7099721dd (diff) | |
parent | 46f3e4dbcbf03aedad83694a45fc32a85ef4db17 (diff) | |
download | kernel-31a291653a8222da7dd2f25077552b273c4d87f2.tar.gz kernel-31a291653a8222da7dd2f25077552b273c4d87f2.tar.xz kernel-31a291653a8222da7dd2f25077552b273c4d87f2.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 28c6517ad..264055984 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1,6 +1,5 @@ # i386 # CONFIG_60XX_WDT is not set -# CONFIG_64BIT is not set CONFIG_6LOWPAN_DEBUGFS=y CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m @@ -134,6 +133,7 @@ CONFIG_AD7949=m CONFIG_ADAPTEC_STARFIRE=m # CONFIG_ADE7854 is not set # CONFIG_ADF4350 is not set +# CONFIG_ADF4371 is not set # CONFIG_ADFS_FS is not set # CONFIG_ADIS16080 is not set # CONFIG_ADIS16130 is not set @@ -253,7 +253,6 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCNET is not set CONFIG_ARM64_ERRATUM_858921=y # CONFIG_AS3935 is not set -# CONFIG_ASIX_PHY is not set CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -584,6 +583,7 @@ CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_MTK is not set CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIUART_3WIRE=y @@ -877,6 +877,7 @@ CONFIG_CRC_PMIC_OPREGION=y CONFIG_CRC_T10DIF=y # CONFIG_CROS_EC_DEBUGFS is not set CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_ISHTP=m # CONFIG_CROS_EC_LIGHTBAR is not set CONFIG_CROS_EC_PROTO=y CONFIG_CROS_EC_RPMSG=m @@ -1188,6 +1189,7 @@ CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set CONFIG_DPOT_DAC=m +# CONFIG_DPS310 is not set CONFIG_DPTF_POWER=m CONFIG_DRAGONRISE_FF=y # CONFIG_DRBD_FAULT_INJECTION is not set @@ -1487,6 +1489,7 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_FSA9480 is not set # CONFIG_EXTCON_GPIO is not set CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON_MAX3355 is not set @@ -1644,6 +1647,7 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set +# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set # CONFIG_FSL_ENETC is not set # CONFIG_FSL_ENETC_PTP_CLOCK is not set # CONFIG_FSL_ENETC_VF is not set @@ -1781,6 +1785,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m # CONFIG_GUP_BENCHMARK is not set +CONFIG_GVE=m # CONFIG_HABANA_AI is not set CONFIG_HAMACHI=m CONFIG_HAMRADIO=y @@ -2146,6 +2151,7 @@ CONFIG_IIO_BUFFER=y CONFIG_IIO_CONFIGFS=m CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m +# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set # CONFIG_IIO_HRTIMER_TRIGGER is not set CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_IIO_KFIFO_BUF=m @@ -3417,10 +3423,13 @@ CONFIG_NET_9P_XEN=m CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_IFE=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_POLICE=m @@ -3475,6 +3484,8 @@ CONFIG_NET_DSA_TAG_KSZ=m CONFIG_NET_DSA_TAG_SJA1105=m CONFIG_NET_DSA_TAG_TRAILER=m # CONFIG_NET_DSA_VITESSE_VSC73XX is not set +# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set +# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set CONFIG_NET_EMATCH_CANID=m CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_IPSET=m @@ -3660,6 +3671,7 @@ CONFIG_NET_VENDOR_EMULEX=y # CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_FUJITSU is not set +CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HISILICON is not set # CONFIG_NET_VENDOR_HP is not set # CONFIG_NET_VENDOR_HUAWEI is not set @@ -3723,6 +3735,7 @@ CONFIG_NFC_NCI_SPI=m CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_NXP_NCI=m CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m @@ -3813,6 +3826,7 @@ CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m +CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_COMPAT=m # CONFIG_NFT_CONNLIMIT is not set @@ -3844,6 +3858,7 @@ CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m # CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SYNPROXY=m # CONFIG_NFT_TPROXY is not set # CONFIG_NFT_TUNNEL is not set CONFIG_NFT_XFRM=m @@ -3928,6 +3943,8 @@ CONFIG_NTB_SWITCHTEC=m CONFIG_NULL_TTY=m # CONFIG_NUMA is not set CONFIG_NVME_FC=m +# CONFIG_NVMEM_IMX_OCOTP_SCU is not set +# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y @@ -3942,6 +3959,7 @@ CONFIG_NVME_TCP=m # CONFIG_NVM is not set CONFIG_NVRAM=y CONFIG_NV_TCO=m +# CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set CONFIG_OCFS2_FS=m @@ -4148,9 +4166,11 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHYLIB=y CONFIG_PHYLINK=m # CONFIG_PHY_MAPPHONE_MDM6600 is not set +# CONFIG_PHY_MIXEL_MIPI_DPHY is not set # CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set # CONFIG_PHY_QCOM_USB_HS is not set CONFIG_PHYSICAL_ALIGN=0x400000 @@ -4622,6 +4642,7 @@ CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WILCO_EC=m CONFIG_RTC_DRV_X1205=m # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_HCTOSYS_DEVICE="rtc0" @@ -4737,6 +4758,7 @@ CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_ESAS2R=m CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_FDOMAIN_PCI=m CONFIG_SCSI_FLASHPOINT=y CONFIG_SCSI_GDTH=m # CONFIG_SCSI_HISI_SAS is not set @@ -4900,6 +4922,7 @@ CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_IR35221 is not set # CONFIG_SENSORS_IR38064 is not set +# CONFIG_SENSORS_IRPS5401 is not set # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set # CONFIG_SENSORS_ISL68137 is not set @@ -4972,6 +4995,7 @@ CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_PWM_FAN=m +# CONFIG_SENSORS_PXE1610 is not set CONFIG_SENSORS_RM3100_I2C=m CONFIG_SENSORS_RM3100_SPI=m CONFIG_SENSORS_SCH5627=m @@ -5602,6 +5626,7 @@ CONFIG_STK3310=m CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set # CONFIG_STMMAC_PLATFORM is not set +# CONFIG_STMMAC_SELFTESTS is not set CONFIG_STRICT_DEVMEM=y # CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y @@ -5705,6 +5730,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITFIELD is not set # CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set @@ -6510,6 +6536,10 @@ CONFIG_WIL6210=m # CONFIG_WIL6210_TRACING is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set +# CONFIG_WILCO_EC_DEBUGFS is not set +# CONFIG_WILCO_EC_EVENTS is not set +CONFIG_WILCO_EC=m +# CONFIG_WILCO_EC_TELEMETRY is not set CONFIG_WILINK_PLATFORM_DATA=y # CONFIG_WIMAX is not set CONFIG_WINBOND_840=m @@ -6657,12 +6687,15 @@ CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_WARN is not set # CONFIG_XIL_AXIS_FIFO is not set +# CONFIG_XILINX_AXI_EMAC is not set # CONFIG_XILINX_DMA is not set CONFIG_XILINX_GMII2RGMII=m CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m +# CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_XADC is not set CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m |