summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-09-08 21:20:02 +0100
committerPeter Robinson <pbrobinson@gmail.com>2015-09-08 21:20:02 +0100
commitbcf80c1db25a698dc9d79f58f227b7c392f7899a (patch)
tree214c5c728c8e44aa843aae630d7df5668fbee052 /config-generic
parent727908fdd83d19b4d34311e9b3d73e2a2d168a51 (diff)
downloadkernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.tar.gz
kernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.tar.xz
kernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.zip
Config updates for ARMv7/aarch64
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 5e8c88c2f..ff9f9b918 100644
--- a/config-generic
+++ b/config-generic
@@ -1916,10 +1916,10 @@ CONFIG_IEEE802154_SOCKET=m
CONFIG_IEEE802154_6LOWPAN=m
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_ATUSB=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
@@ -2130,6 +2130,7 @@ CONFIG_BT_HCIUART_LL=y
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
+CONFIG_BT_QCA=m
CONFIG_BT_WILINK=m
#