summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 15:51:31 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 15:51:31 -0400
commit96d2a08f32343b4d5389babcf789cdfb09152588 (patch)
treee5f74c9845f9df52ca6048479964a17ad33bd258 /config-generic
parent3bb1cf17f4f3b83bae736bd788abbf464f7f218f (diff)
downloadkernel-96d2a08f32343b4d5389babcf789cdfb09152588.tar.gz
kernel-96d2a08f32343b4d5389babcf789cdfb09152588.tar.xz
kernel-96d2a08f32343b4d5389babcf789cdfb09152588.zip
Linux v4.0-5833-g6c373ca89399
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic16
1 files changed, 16 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index aaf891c81..e24f33c46 100644
--- a/config-generic
+++ b/config-generic
@@ -1150,6 +1150,7 @@ CONFIG_IP_DCCP_CCID3=y
#
CONFIG_TIPC=m
# CONFIG_TIPC_MEDIA_IB is not set
+CONFIG_TIPC_MEDIA_UDP=y
CONFIG_NETLABEL=y
@@ -1857,10 +1858,20 @@ CONFIG_IEEE802154_CC2520=m
CONFIG_MAC802154=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
CONFIG_NET_SWITCHDEV=y
CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+
#
# Token Ring devices
@@ -1924,6 +1935,7 @@ CONFIG_NFC_ST21NFCA=m
CONFIG_NFC_ST21NFCA_I2C=m
# CONFIG_NFC_ST21NFCB is not set
# CONFIG_NFC_ST21NFCB_I2C is not set
+# CONFIG_NFC_NXP_NCI is not set
# CONFIG_NFC_NCI_SPI is not set
@@ -1973,6 +1985,7 @@ CONFIG_BT_BREDR=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=m
# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
CONFIG_BT_SCO=y
CONFIG_BT_CMTP=m
CONFIG_BT_RFCOMM=m
@@ -1988,11 +2001,14 @@ CONFIG_BT_HIDP=m
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_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m