diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 1199736a..ac919e51 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -157,6 +157,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_notifier_init
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += vm_area_struct_has_const_vm_flags
 NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_fd_to_handle
 NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_handle_to_fd
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += crypto_engine_ctx_struct_removed_test
 NV_CONFTEST_MACRO_COMPILE_TESTS ?=
 NV_CONFTEST_SYMBOL_COMPILE_TESTS ?=
 NV_CONFTEST_TYPE_COMPILE_TESTS += request_struct_has_completion_data_arg
@@ -165,7 +166,7 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,functions,$(NV_CONFTEST_FUNCTION_C
 $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,generic,$(NV_CONFTEST_GENERIC_COMPILE_TESTS)))
 $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,macros,$(NV_CONFTEST_MACRO_COMPILE_TESTS)))
 $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,symbols,$(NV_CONFTEST_SYMBOL_COMPILE_TESTS)))
-$(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPE_COMPILE_TESTS)))
+$(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPES_COMPILE_TESTS)))
 
 $(obj)/conftest/patches.h: $(NV_CONFTEST_SCRIPT)
 	@mkdir -p $(obj)/conftest
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 94fa0cfc..e7f6b1a9 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -7542,6 +7542,24 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_V4L2_ASYNC_NOTIFIER_INIT_PRESENT" "" "functions"
         ;;
 
+        crypto_engine_ctx_struct_removed_test)
+            #
+            # Determine if struct 'crypto_engine_ctx' is removed in linux kernel.
+            #
+            # Commit 5ce0bc68e0ee ("crypto: engine - Remove crypto_engine_ctx")
+            # Linux v6.6 removed struct crypto_engine_ctx
+            #
+            CODE="
+            #include <crypto/engine.h>
+            void conftest_crypto_engine_ctx_struct_removed_test(void) {
+                    struct crypto_engine_ctx *ptr = NULL;
+                    struct crypto_engine_ctx enginectx;
+                    ptr = &enginectx;
+            }"
+
+            compile_check_conftest "$CODE" "NV_CONFTEST_REMOVE_STRUCT_CRYPTO_ENGINE_CTX" "" "functions"
+        ;;
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.
         #