Skip to content

Commit d3b99c1

Browse files
committed
Merge branch 'at91-4.19-trunk/defconfig' into linux-4.19-at91
2 parents aacc3d2 + 0c36828 commit d3b99c1

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

arch/arm/configs/sama5_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ CONFIG_BT_HCIUART=y
8080
CONFIG_BT_HCIUART_H4=y
8181
CONFIG_BT_HCIUART_3WIRE=y
8282
CONFIG_BT_HCIVHCI=y
83-
CONFIG_CFG80211=y
83+
CONFIG_CFG80211=m
8484
# CONFIG_CFG80211_DEFAULT_PS is not set
8585
CONFIG_CFG80211_DEBUGFS=y
8686
CONFIG_CFG80211_WEXT=y
87-
CONFIG_MAC80211=y
87+
CONFIG_MAC80211=m
8888
CONFIG_MAC80211_LEDS=y
8989
CONFIG_RFKILL=y
9090
CONFIG_RFKILL_INPUT=y
@@ -297,6 +297,9 @@ CONFIG_NLS_CODEPAGE_437=y
297297
CONFIG_NLS_CODEPAGE_850=y
298298
CONFIG_NLS_ISO8859_1=y
299299
CONFIG_NLS_UTF8=y
300+
CONFIG_CRYPTO_CCM=y
301+
CONFIG_CRYPTO_GCM=y
302+
CONFIG_CRYPTO_ARC4=y
300303
CONFIG_CRYPTO_USER_API_HASH=m
301304
CONFIG_CRYPTO_USER_API_SKCIPHER=m
302305
CONFIG_CRYPTO_DEV_ATMEL_AES=y

0 commit comments

Comments
 (0)