diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-05-18 08:28:46 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-05-18 08:32:30 -0700 |
| commit | af495309bb553b4659f08470ac94fedf74b3845a (patch) | |
| tree | f540f17c8dea7042a98db7f6b1d6729817829d27 /config-generic | |
| parent | 3856ef7eb1db56671e00a069af6c0614c6b21c7f (diff) | |
| download | kernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.gz kernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.xz kernel-af495309bb553b4659f08470ac94fedf74b3845a.zip | |
Linux v4.6-3623-g0b7962a
ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs,
timers, crypto merges
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 272fa4a75..70731ecda 100644 --- a/config-generic +++ b/config-generic @@ -813,6 +813,7 @@ CONFIG_NET_IPVTI=m CONFIG_NET_FOU=m CONFIG_NET_FOU_IP_TUNNELS=y CONFIG_GENEVE=m +CONFIG_GTP=m CONFIG_MACSEC=m CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -1565,6 +1566,10 @@ CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_QED=m CONFIG_QEDE=m +CONFIG_QED_SRIOV=y +# CONFIG_QEDE_VXLAN is not set +# CONFIG_QEDE_GENEVE is not set + # CONFIG_NET_VENDOR_QUALCOMM is not set @@ -1634,6 +1639,7 @@ CONFIG_VIA_VELOCITY=m CONFIG_NET_VENDOR_WIZNET=y CONFIG_WIZNET_W5100=m CONFIG_WIZNET_W5300=m +CONFIG_WIZNET_W5100_SPI=m CONFIG_NET_VENDOR_XIRCOM=y CONFIG_PCMCIA_XIRC2PS=m @@ -1714,6 +1720,7 @@ CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_PCI=m CONFIG_MLXSW_SWITCHX2=m CONFIG_MLXSW_SPECTRUM=m +CONFIG_MLXSW_SPECTRUM_DCB=y # CONFIG_MLX4_DEBUG is not set # CONFIG_SFC is not set @@ -2107,6 +2114,8 @@ CONFIG_NFC_PORT100=m CONFIG_NFC_PN544=m CONFIG_NFC_PN544_I2C=m CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_I2C=m CONFIG_NFC_TRF7970A=m @@ -4101,6 +4110,7 @@ CONFIG_HID_LENOVO=m CONFIG_HID_CORSAIR=m CONFIG_HID_GFRM=m CONFIG_HID_CMEDIA=m +CONFIG_HID_ASUS=m # # USB Imaging devices @@ -5570,6 +5580,7 @@ CONFIG_NET_DSA_MV88E6131=m CONFIG_NET_DSA_MV88E6123=m CONFIG_NET_DSA_MV88E6171=m CONFIG_NET_DSA_MV88E6352=m +CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_BCM_SF2=m # Used by Maemo, we don't care. |