diff --git a/Makefile b/Makefile
index ee1bcabb..a899e6bb 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,9 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME
 # Deprecate PCIED Error reporting pci_enable_pcie_error_reporting
 subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING
 
+# Drop the API for pcie_disable_pcie_error_reporting
+subdir-ccflags-y += -DNV_PCIE_DIABLE_PCIE_ERROR_REPORTING_DROP
+
 # Crypto driver has major change in it ops, skip it
 export CONFIG_SKIP_CRYPTO=y
 endif
diff --git a/drivers/misc/nvscic2c-pcie/epc/module.c b/drivers/misc/nvscic2c-pcie/epc/module.c
index a6ebe630..bd273f25 100644
--- a/drivers/misc/nvscic2c-pcie/epc/module.c
+++ b/drivers/misc/nvscic2c-pcie/epc/module.c
@@ -290,7 +290,9 @@ deinit:
 
 	pci_release_region(pdev, 0);
 	pci_clear_master(pdev);
+#if !defined(NV_PCIE_DIABLE_PCIE_ERROR_REPORTING_DROP)
 	pci_disable_pcie_error_reporting(pdev);
+#endif
 	pci_disable_device(pdev);
 
 	dt_release(&drv_ctx->drv_param);