diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 4833ee63..ccb6eccb 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -127,6 +127,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_get_named_gpio_flags
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_gpio_named_count
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += gpio_chip_struct_has_of_node_present
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += gpiochip_find
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pwm_ops_struct_has_owner
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_disable_pcie_error_reporting
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 69496f61..78872a1d 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -5480,6 +5480,24 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_GPIO_CHIP_STRUCT_HAS_OF_NODE_PRESENT" "" "types"
         ;;
 
+        gpiochip_find)
+            #
+            # Determine if function gpiochip_find() present or not.
+            #
+            # The function gpiochip_find() is removed from commit 2654521d774f9
+            # ("gpiolib: remove gpiochip_find()" in Linux 6.7
+            #
+            CODE="
+            #include <linux/gpio/driver.h>
+            void conftest_gpiochip_find_present(void)
+            {
+                gpiochip_find();
+            }
+            "
+
+            compile_check_conftest "$CODE" "NV_GPIOCHIP_FIND_PRESENT" "" "functions"
+        ;;
+
         devm_gpio_request_one)
             #
             # Determine if devm_gpio_request_one() function is present