diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 608323ddb022..ca1fecb63959 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -57,7 +57,6 @@ CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LAHAINA_LLCC=m
 CONFIG_QCOM_SHIMA_LLCC=m
 CONFIG_QCOM_IPCC=m
-CONFIG_QCOM_WATCHDOG=m
 CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_MEMORY_DUMP_V2=m
 CONFIG_QCOM_SCM=m
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index fda28dc57427..d47cd893fbfb 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -783,15 +783,6 @@ config CDSPRM_VTCM_DYNAMIC_DEBUG
 	  enabled, the vtcm partition details are sent to the CDSP via rpmsg
 	  channel.
 
-config QCOM_WATCHDOG
-	tristate "Qualcomm Watchdog Support"
-	depends on ARCH_QCOM
-	help
-          This enables the watchdog module. It causes kernel panic if the
-          watchdog times out. It allows for detection of cpu hangs and
-          deadlocks. It does not run during the bootup process, so it will
-          not catch any early lockups.
-
 config QCOM_FORCE_WDOG_BITE_ON_PANIC
 	bool "QCOM force watchdog bite on panic"
 	depends on QCOM_WATCHDOG
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 1d9bf33c9254..cf4c353c7d64 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -74,7 +74,6 @@ ifdef CONFIG_MSM_RPM_SMD
 obj-$(CONFIG_QTI_RPM_STATS_LOG) += rpm_master_stat.o
 endif
 obj-$(CONFIG_QPNP_PBS) += qpnp-pbs.o
-obj-$(CONFIG_QCOM_WATCHDOG) += qcom_watchdog.o
 obj-$(CONFIG_MSM_SPCOM) += spcom.o
 obj-$(CONFIG_QCOM_CDSP_RM) += cdsprm.o
 obj-$(CONFIG_QCOM_FSA4480_I2C) += fsa4480-i2c.o