summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-02 07:51:01 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-02 08:19:10 -0400
commit097cca69627f45fbff23f9761405c47d440535a7 (patch)
tree129d6f72069c7749e5e1145f79a1ddffbdf7f461 /config-generic
parent07dc3e04ce1e8a72c78e85e1317a226395edaca1 (diff)
downloadkernel-097cca69627f45fbff23f9761405c47d440535a7.tar.gz
kernel-097cca69627f45fbff23f9761405c47d440535a7.tar.xz
kernel-097cca69627f45fbff23f9761405c47d440535a7.zip
Linux v3.9-7391-g20b4fb4
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic13
1 files changed, 13 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index fdee19c6d..075f207e9 100644
--- a/config-generic
+++ b/config-generic
@@ -656,6 +656,9 @@ CONFIG_NET=y
CONFIG_NET_DMA=y
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
CONFIG_TCP_CONG_CUBIC=y
@@ -1041,6 +1044,7 @@ CONFIG_IP_DCCP_CCID3=y
#
CONFIG_TIPC=m
CONFIG_TIPC_PORTS=8192
+# CONFIG_TIPC_MEDIA_IB is not set
# CONFIG_TIPC_ADVANCED is not set
# CONFIG_TIPC_DEBUG is not set
@@ -1111,6 +1115,8 @@ CONFIG_DNS_RESOLVER=m
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_VSOCKETS=m
@@ -1137,6 +1143,7 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_MACVLAN=m
@@ -1336,6 +1343,7 @@ CONFIG_YELLOWFIN=m
CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
@@ -1526,6 +1534,7 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_DEBUG=y
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_TRACING is not set
CONFIG_AR5523=m
CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
@@ -1630,6 +1639,7 @@ CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT3290=y
@@ -1666,6 +1676,7 @@ CONFIG_RTL8192SE=m
CONFIG_RTL8192CU=m
CONFIG_RTL8192DE=m
CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
@@ -1961,6 +1972,7 @@ CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
# CONFIG_INPUT_ADXL34X is not set
# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -1979,6 +1991,7 @@ CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
# CONFIG_SERIO_PS2MULT is not set
CONFIG_SERIO_ARC_PS2=m
+# CONFIG_SERIO_APBPS2 is not set
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set