summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-05-01 11:54:16 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2018-05-01 11:54:16 -0700
commitdce4c94eedbd35cd63aa04ee9b022de6d23ee587 (patch)
tree9022f04efa10769f36fc41fa2d88549929c14803 /arch/arm64/configs
parent60cc43fc888428bb2f18f08997432d426a243338 (diff)
parent69bc5b2c056b4e784b49a8c9c5049561b62352f7 (diff)
downloadlinux-dce4c94eedbd35cd63aa04ee9b022de6d23ee587.tar.bz2
Merge tag 'bcm2835-defconfig-64-next-2018-04-30' into defconfig-arm64/next
This pull request enables the Raspberry Pi 3 B+'s LAN and bluetooth in the arm64 defconfig. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index ecf613761e78..8ac1feafe563 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -159,6 +159,7 @@ CONFIG_BT_LEDS=y
# CONFIG_BT_DEBUGFS is not set
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_BCM=y
CONFIG_CFG80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_LEDS=y
@@ -239,6 +240,7 @@ CONFIG_ROCKCHIP_PHY=y
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SR9800=m