File tree Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -109,14 +109,7 @@ config WIFI_NM_WPA_SUPPLICANT_WEP
109109
110110choice WIFI_NM_WPA_SUPPLICANT_CRYPTO_BACKEND
111111 prompt "WPA supplicant crypto implementation"
112- <<<<<<< HEAD
113- default WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA if SOC_SERIES_NRF54HX
114- default WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_NCS_PSA if SOC_SERIES_NRF54LX || BUILD_WITH_TFM
115- default WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_LEGACY_NCS
116- =======
117- default WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_NCS
118- default WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_NCS_PSA if SOC_SERIES_NRF54LX
119- >>>>>>> parent of 371c48ba2d0 ([nrf noup] modules: hostap: Support Wi-Fi EAP-TLS mode)
112+ default WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
120113 help
121114 Select the crypto implementation to use for WPA supplicant.
122115 WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT supports enterprise mode
You can’t perform that action at this time.
0 commit comments