Linux v3.10-9080-g19d2f8e

1 files changed, 25 insertions, 1 deletions

diff --git a/config-generic b/config-generic
index 5d655c1ad..2fbeda422 100644
--- a/config-generic
+++ b/config-generic
@@ -1130,6 +1130,7 @@ CONFIG_BATMAN_ADV_NC=y
 
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_NETPRIO_CGROUP=m
 
@@ -1163,6 +1164,7 @@ CONFIG_VXLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m
+CONFIG_NLMON=m
 
 #
 # ATM
@@ -1235,6 +1237,9 @@ CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_PCMCIA_NMCLAN=m
 
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
+
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ALX=m
 CONFIG_ATL2=m
@@ -1369,6 +1374,8 @@ CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 
+CONFIG_SH_ETH=m
+
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 
@@ -1443,6 +1450,7 @@ CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_PHY=m
 
 CONFIG_MII=m
+CONFIG_NET_CORE=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
@@ -1559,8 +1567,14 @@ CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_ATH10K_DEBUGFS=y
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_HWRNG is not set
@@ -1604,6 +1618,9 @@ CONFIG_PCMCIA_HERMES=m
 CONFIG_ORINOCO_USB=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCMCIA_SPECTRUM is not set
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 # CONFIG_HOSTAP is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
@@ -1740,6 +1757,7 @@ CONFIG_NFC_NCI=m
 CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_LLCP=y
+CONFIG_NFC_SIM=m
 
 #
 # Near Field Communication (NFC) devices
@@ -3103,6 +3121,7 @@ CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_GENERIC=y
@@ -3655,6 +3674,7 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_STMPE is not set
@@ -3799,6 +3819,7 @@ CONFIG_UFS_FS=m
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_FUSE_FS=m
 # CONFIG_OMFS_FS is not set
 CONFIG_CUSE=m
@@ -3817,11 +3838,11 @@ CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_2=y
-NFS_V4_SECURITY_LABEL=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_PNFS_OBJLAYOUT=m
@@ -4651,6 +4672,7 @@ CONFIG_IMA_LSM_RULES=y
 
 # CONFIG_EVM is not set
 # CONFIG_PWM is not set
+# CONFIG_PWM_PCA9685 is not set
 
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
@@ -4681,6 +4703,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
 
 CONFIG_MAC802154=m
+CONFIG_NET_MPLS_GSO=m
 
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
@@ -4699,6 +4722,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
 
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZSWAP=y
 
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_KEYBOARD_GPIO is not set