diff --git a/Makefile b/Makefile
index 20486b0b..62608805 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,6 @@ endif
 
 # Changes done in Linux 6.6 onwards
 ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_6); echo $$?),0)
-# Rename async_nf_init and v4l2_async_subdev_nf_register
-subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME
-
 # PCIE EPF driver probe has additional argument as ID
 subdir-ccflags-y += -DNV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG
 
diff --git a/drivers/media/platform/tegra/camera/vi/graph.c b/drivers/media/platform/tegra/camera/vi/graph.c
index edb744fa..3f36f906 100644
--- a/drivers/media/platform/tegra/camera/vi/graph.c
+++ b/drivers/media/platform/tegra/camera/vi/graph.c
@@ -672,7 +672,7 @@ int tegra_vi_graph_init(struct tegra_mc_vi *vi)
 		list_for_each_entry(entity, &chan->entities, list)
 			__v4l2_async_notifier_add_subdev(&chan->notifier, &entity->asd);
 #else
-#if defined (NV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME)
+#if defined (NV_V4L2_ASYNC_SUBDEV_NF_INIT_PRESENT) /* Linux 6.5 */
 		v4l2_async_subdev_nf_init(&chan->notifier, tegra_channel_find_linked_csi_subdev(chan));
 		list_for_each_entry(entity, &chan->entities, list) {
 			struct v4l2_async_connection *asd;
@@ -698,7 +698,7 @@ int tegra_vi_graph_init(struct tegra_mc_vi *vi)
 		ret = v4l2_async_notifier_register(&vi->v4l2_dev,
 					&chan->notifier);
 #else
-#if defined (NV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME)
+#if defined (NV_V4L2_ASYNC_SUBDEV_NF_INIT_PRESENT) /* Linux 6.5 */
 		ret = v4l2_async_nf_register(&chan->notifier);
 #else
 		ret = v4l2_async_nf_register(&vi->v4l2_dev,
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index f491f9ca..47433df3 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -144,6 +144,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_ivc_struct_has_iosys_map
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += tty_operations_struct_write_has_u8_ptr_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_connection_struct_present
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_match_type_enum_present
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_subdev_nf_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
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index a701ed92..1eafeb0e 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -7358,6 +7358,23 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_V4L2_ASYNC_MATCH_TYPE_ENUM_PRESENT" "" "types"
         ;;
 
+        v4l2_async_subdev_nf_init)
+            #
+            # Determine if the function v4l2_async_subdev_nf_init() present or not.
+            #
+            # In Linux 6.5, with change commit bda8953e8c3e7e ("media: v4l: async:
+            # Drop v4l2_async_nf_parse_fwnode_endpoints()"), added the function
+            # v4l2_async_subdev_nf_init() and dropped v4l2_async_nf_init().
+            #
+            CODE="
+            #include <media/v4l2-async.h>
+            void conftest_v4l2_async_subdev_nf_init(void) {
+                v4l2_async_subdev_nf_init();
+            }"
+
+            compile_check_conftest "$CODE" "NV_V4L2_ASYNC_SUBDEV_NF_INIT_PRESENT" "" "functions"
+        ;;
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.
         #