diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 07:21:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 07:21:53 +0200 |
commit | 69d1be1f0ca6008948af4201d0aa7edf86b9394f (patch) | |
tree | 4b29cc222641b712420c77deb3e60943f09d6c96 /kernel-i686-PAE.config | |
parent | ec7fac53943a8231feb997c03cc66390160ef73e (diff) | |
parent | c528f49c023bad88f68a601732760ccfd2379e5c (diff) | |
download | kernel-69d1be1f0ca6008948af4201d0aa7edf86b9394f.tar.gz kernel-69d1be1f0ca6008948af4201d0aa7edf86b9394f.tar.xz kernel-69d1be1f0ca6008948af4201d0aa7edf86b9394f.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git2.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git2.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git2.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git2.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 84e4291fe..a2c11e358 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -615,14 +615,17 @@ CONFIG_CAN_ESD_USB2=m # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m +CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_LEDS=y CONFIG_CAN=m CONFIG_CAN_M_CAN=m +CONFIG_CAN_MCBA_USB=m # CONFIG_CAN_MCP251X is not set CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m # CONFIG_CAN_PEAK_PCMCIA is not set CONFIG_CAN_PEAK_USB=m @@ -636,6 +639,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m # CONFIG_CAN_TSCAN1 is not set CONFIG_CAN_VCAN=m +CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set CONFIG_CAPI_AVM=y CONFIG_CAPI_EICON=y @@ -833,6 +837,7 @@ CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m CONFIG_CRYPTO_DEV_CCP=y @@ -1620,6 +1625,7 @@ CONFIG_HFSPLUS_FS=m # CONFIG_HI8435 is not set CONFIG_HIBERNATION=y CONFIG_HID_A4TECH=m +CONFIG_HID_ACCUTOUCH=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_ACRUX=m CONFIG_HID_ALPS=m @@ -1664,6 +1670,7 @@ CONFIG_HID_MAYFLASH=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTI=m CONFIG_HID_NTRIG=y CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m @@ -1913,6 +1920,8 @@ CONFIG_IEEE802154_ADF7242=m # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set CONFIG_IEEE802154_AT86RF230=m CONFIG_IEEE802154_ATUSB=m +# CONFIG_IEEE802154_CA8210_DEBUGFS is not set +CONFIG_IEEE802154_CA8210=m CONFIG_IEEE802154_CC2520=m CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKELB=m @@ -2893,6 +2902,7 @@ CONFIG_MLX4_EN=m CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m # CONFIG_MLX5_INFINIBAND is not set # CONFIG_MLX90614 is not set @@ -2917,6 +2927,7 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 +# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -2934,6 +2945,7 @@ CONFIG_MMC_SDHCI=m # CONFIG_MMC_SDHCI_OF is not set CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set # CONFIG_MMC_TEST is not set @@ -3149,11 +3161,15 @@ CONFIG_NET_DEVLINK=m CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_HWMON=y +CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_SMSC_LAN9303_I2C=m +CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m CONFIG_NET_EMATCH_CANID=m CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_IPSET=m @@ -3276,6 +3292,7 @@ CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_CODEL=m +# CONFIG_NET_SCH_DEFAULT is not set CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCHED=y @@ -3368,6 +3385,7 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m +# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4044,6 +4062,8 @@ CONFIG_ROCKETPORT=m CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5149,6 +5169,7 @@ CONFIG_THRUSTMASTER_FF=y # CONFIG_TI_DAC7512 is not set CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m +CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set # CONFIG_TIMER_STATS is not set @@ -5777,6 +5798,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m CONFIG_VORTEX=m CONFIG_VSOCKETS=m +CONFIG_VSOCKMON=m # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set CONFIG_VT_CONSOLE=y |