Skip to content

Commit fe15300

Browse files
committed
Merge branch 'at91-5.4-trunk/defconfig' into linux-5.4-at91
2 parents a3410d4 + b323f40 commit fe15300

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ CONFIG_VLAN_8021Q=m
6060
CONFIG_CAN=y
6161
CONFIG_CAN_AT91=y
6262
CONFIG_CAN_M_CAN=y
63+
CONFIG_CAN_M_CAN_PLATFORM=y
6364
CONFIG_BT=y
6465
CONFIG_BT_RFCOMM=y
6566
CONFIG_BT_RFCOMM_TTY=y

0 commit comments

Comments
 (0)