From 35eff41288ccf2a1ddd555db0b0e51906af970a0 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 26 Jun 2015 09:33:38 -0400 Subject: Linux v4.1-5596-gaefbef10e3ae --- config-generic | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'config-generic') diff --git a/config-generic b/config-generic index 24a338792..9f5f61e08 100644 --- a/config-generic +++ b/config-generic @@ -148,6 +148,7 @@ CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_VUB300=m CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_MTK=m # CONFIG_MMC_SPI is not set # CONFIG_MMC_SDHCI_OF_ARASAN is not set # CONFIG_MMC_SDHCI_F_SDH30 is not set @@ -558,6 +559,8 @@ CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m CONFIG_FCOE_FNIC=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set CONFIG_ATA=y CONFIG_ATA_BMDMA=y @@ -736,6 +739,7 @@ CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_HYBLA=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_VEGAS=m @@ -779,6 +783,7 @@ CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m CONFIG_NET_FOU=m CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_GENEVE_CORE=m CONFIG_GENEVE=m CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -859,6 +864,7 @@ CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y CONFIG_NF_CONNTRACK=m +CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m @@ -1032,6 +1038,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m # nf_tables support CONFIG_NF_TABLES=m CONFIG_NF_TABLES_INET=m +CONFIG_NF_TABLES_NETDEV=m CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_CT=m @@ -1195,6 +1202,7 @@ CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_IND=y @@ -1375,6 +1383,8 @@ CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m +# CONFIG_NET_VENDOR_CAVIUM is not set + CONFIG_NET_VENDOR_CHELSIO=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y @@ -1413,12 +1423,14 @@ CONFIG_SUNDANCE=m CONFIG_NET_VENDOR_EMULEX=y CONFIG_BE2NET=m CONFIG_BE2NET_VXLAN=y +# CONFIG_BE2NET_HWMON is not set CONFIG_NET_VENDOR_EXAR=y CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set +# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_FUJITSU is not set # CONFIG_NET_VENDOR_HISILICON is not set @@ -1510,6 +1522,8 @@ CONFIG_R8169=m CONFIG_SH_ETH=m +# CONFIG_NET_VENDOR_RENESAS is not set + CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m @@ -1586,6 +1600,7 @@ CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_VITESSE_PHY=m CONFIG_MICREL_PHY=m +CONFIG_DP83867_PHY=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MII=m @@ -1617,6 +1632,7 @@ CONFIG_JME=m # CONFIG_IP1000 is not set # CONFIG_MLX4_EN is not set # CONFIG_MLX4_EN_VXLAN is not set +# CONFIG_MLX5_CORE is not set # CONFIG_SFC is not set # CONFIG_FDDI is not set @@ -1802,6 +1818,8 @@ CONFIG_RSI_USB=m CONFIG_RT2X00=m CONFIG_RT2X00_LIB_DEBUGFS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_WL_MEDIATEK=y +CONFIG_MT7601U=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m CONFIG_RT61PCI=m @@ -1862,6 +1880,7 @@ CONFIG_IEEE802154_FAKELB=m CONFIG_IEEE802154_CC2520=m # CONFIG_IEEE802154_AT86RF230 is not set # CONFIG_IEEE802154_MRF24J40 is not set +# CONFIG_IEEE802154_ATUSB is not set CONFIG_MAC802154=m CONFIG_NET_MPLS_GSO=m @@ -1944,6 +1963,8 @@ CONFIG_NFC_ST21NFCA_I2C=m # CONFIG_NFC_ST21NFCB_I2C is not set # CONFIG_NFC_NXP_NCI is not set # CONFIG_NFC_NCI_SPI is not set +# CONFIG_NFC_NCI_UART is not set +# CONFIG_NFC_ST_NCI is not set # @@ -2009,6 +2030,7 @@ CONFIG_BT_HCIBTUSB=m # Disable the BT_HCIUSB driver. # It sucks more power than BT_HCIBTUSB which has the same functionality. CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y @@ -2158,6 +2180,7 @@ CONFIG_GIGASET_M105=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=m # @@ -2192,6 +2215,7 @@ CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set # @@ -2612,6 +2636,7 @@ CONFIG_CHARGER_SMB347=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_TC74=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP401=m CONFIG_APDS9802ALS=m @@ -4310,6 +4335,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set # # Network File Systems @@ -4672,6 +4698,15 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_ECHAINIV=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y + @@ -5093,6 +5128,10 @@ CONFIG_APM_POWER=m # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_RT9455 is not set + CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_LTC2952 is not set # CONFIG_POWER_RESET_SYSCON is not set @@ -5308,12 +5347,16 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TORTURE_TEST_SLOW_INIT is not set CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 +# CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT is not set +# CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP is not set # CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_TASKS_RCU is not set # CONFIG_RCU_USER_QS is not set CONFIG_RCU_KTHREAD_PRIO=0 CONFIG_SPARSE_RCU_POINTER=y +# CONFIG_RCU_EXPERT is not set # CONFIG_LIVEPATCH is not set -- cgit