Skip to content

Commit 9e1183d

Browse files
committed
Merge branch 'at91-4.19-trunk/defconfig' into linux-4.19-at91
2 parents 1e2a90f + f95f640 commit 9e1183d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ CONFIG_IP_PNP_DHCP=y
4545
CONFIG_IPV6_SIT_6RD=y
4646
CONFIG_CAN=y
4747
CONFIG_CAN_AT91=y
48-
CONFIG_CFG80211=y
49-
CONFIG_MAC80211=y
48+
CONFIG_CFG80211=m
49+
CONFIG_MAC80211=m
5050
# CONFIG_UEVENT_HELPER is not set
5151
CONFIG_DEVTMPFS=y
5252
CONFIG_DEVTMPFS_MOUNT=y
@@ -209,7 +209,11 @@ CONFIG_NLS_CODEPAGE_437=y
209209
CONFIG_NLS_CODEPAGE_850=y
210210
CONFIG_NLS_ISO8859_1=y
211211
CONFIG_NLS_UTF8=y
212+
CONFIG_CRYPTO_CCM=y
213+
CONFIG_CRYPTO_GCM=y
212214
CONFIG_CRYPTO_ECB=y
215+
CONFIG_CRYPTO_CMAC=y
216+
CONFIG_CRYPTO_ARC4=y
213217
CONFIG_CRYPTO_USER_API_HASH=m
214218
CONFIG_CRYPTO_USER_API_SKCIPHER=m
215219
# CONFIG_CRYPTO_HW is not set

0 commit comments

Comments
 (0)