Skip to content

Commit 588f193

Browse files
Merge branch 'main' into development/lxc-kernel-5.10
2 parents 72cc43a + f146a03 commit 588f193

File tree

7 files changed

+158
-89
lines changed

7 files changed

+158
-89
lines changed

board/raspberrypi/rpi23-linux-5.10.config

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,17 @@ CONFIG_IP_SCTP=y
274274
CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=y
275275
CONFIG_DNS_RESOLVER=y
276276
CONFIG_NET_L3_MASTER_DEV=y
277+
CONFIG_BT=y
278+
CONFIG_BT_RFCOMM=y
279+
CONFIG_BT_RFCOMM_TTY=y
280+
CONFIG_BT_BNEP=y
281+
CONFIG_BT_BNEP_MC_FILTER=y
282+
CONFIG_BT_BNEP_PROTO_FILTER=y
283+
CONFIG_BT_HIDP=y
284+
CONFIG_BT_HS=y
285+
CONFIG_BT_HCIUART=m
286+
CONFIG_BT_HCIUART_BCM=y
287+
CONFIG_BT_HCIBCM203X=m
277288
CONFIG_CFG80211=m
278289
CONFIG_MAC80211=m
279290
# CONFIG_MAC80211_RC_MINSTREL is not set
@@ -285,15 +296,14 @@ CONFIG_OF_OVERLAY=y
285296
CONFIG_TI_ST=m
286297
CONFIG_NETDEVICES=y
287298
# CONFIG_ETHERNET is not set
288-
CONFIG_SMSC_PHY=y
289299
CONFIG_MDIO_BITBANG=m
290300
CONFIG_USB_LAN78XX=y
291301
CONFIG_USB_USBNET=y
292302
CONFIG_USB_NET_AX8817X=m
293303
CONFIG_USB_NET_AX88179_178A=m
294-
CONFIG_USB_NET_SMSC95XX=y
295304
# CONFIG_USB_NET_CDCETHER is not set
296305
# CONFIG_USB_NET_CDC_NCM is not set
306+
CONFIG_USB_NET_SMSC95XX=y
297307
# CONFIG_USB_NET_NET1080 is not set
298308
# CONFIG_USB_NET_CDC_SUBSET is not set
299309
# CONFIG_USB_NET_ZAURUS is not set
@@ -638,8 +648,6 @@ CONFIG_PWM_PCA9685=m
638648
CONFIG_RPI_AXIPERF=m
639649
CONFIG_EXT2_FS=y
640650
CONFIG_EXT4_FS=y
641-
CONFIG_FILE_LOCKING=y
642-
CONFIG_MANDATORY_FILE_LOCKING=y
643651
# CONFIG_DNOTIFY is not set
644652
CONFIG_AUTOFS_FS=y
645653
CONFIG_VFAT_FS=y

0 commit comments

Comments
 (0)