Skip to content

Commit c3948b1

Browse files
committed
Revert "[nrf noup] modules: hostap: Fix NS build"
This reverts commit 34010be. Signed-off-by: Chaitanya Tata <[email protected]>
1 parent 61fbe8e commit c3948b1

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

modules/hostap/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,7 @@ config WIFI_NM_WPA_SUPPLICANT_WEP
109109

110110
choice 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

0 commit comments

Comments
 (0)