Linux v4.12-6090-g9b51f04

1 files changed, 18 insertions, 0 deletions

diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d75e1db3a..1b8b95de4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -358,6 +358,7 @@ CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
@@ -946,6 +947,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CORESIGHT is not set
+CONFIG_CORTINA_PHY=m
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -1040,8 +1042,10 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_MV_CESA=m
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
+CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 # CONFIG_CRYPTO_DEV_PICOXCELL is not set
 CONFIG_CRYPTO_DEV_QCE=m
@@ -2958,6 +2962,7 @@ CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
 CONFIG_MACB_PCI=m
+CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_375=y
@@ -2994,6 +2999,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_MANTIS_CORE=m
+CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
@@ -3196,6 +3202,8 @@ CONFIG_MFD_WM8994=m
 # CONFIG_MG_DISK is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_KSZ=m
+CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MIGRATION=y
@@ -3223,9 +3231,12 @@ CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA=y
 CONFIG_MLX5_INFINIBAND=m
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
+CONFIG_MLXFW=m
 CONFIG_MLXSW_CORE_HWMON=y
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_THERMAL=y
@@ -3851,6 +3862,7 @@ CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
 # CONFIG_NFP_NET_DEBUG is not set
@@ -4448,6 +4460,8 @@ CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_PXA_DMA=y
 # CONFIG_QCA7000 is not set
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_CLK_RPM=m
@@ -4492,6 +4506,7 @@ CONFIG_QLGE=m
 # CONFIG_QORIQ_THERMAL is not set
 # CONFIG_QRTR is not set
 CONFIG_QSEMI_PHY=m
+CONFIG_QTNFMAC_PEARL_PCIE=m
 CONFIG_QUOTACTL=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -5020,6 +5035,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
+CONFIG_SECURITY_INFINIBAND=y
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -6057,6 +6073,7 @@ CONFIG_TI_SYSCON_RESET=m
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
+CONFIG_TLS=m
 # CONFIG_TMD_HERMES is not set
 CONFIG_TMP006=m
 # CONFIG_TMP007 is not set
@@ -6883,6 +6900,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_WLAN_VENDOR_RSI=y