5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 772ab9dadda7..344f6459862b 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -374,17 +374,6 @@ config TANGO_THERMAL
 
 source "drivers/thermal/tegra/Kconfig"
 
-config QCOM_SPMI_TEMP_ALARM
-        tristate "Qualcomm SPMI PMIC Temperature Alarm"
-        depends on OF && SPMI && IIO
-        select REGMAP_SPMI
-        help
-          This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
-          PMIC devices. It shows up in sysfs as a thermal sensor with multiple
-          trip points. The temperature reported by the thermal sensor reflects the
-          real time die temperature if an ADC is present or an estimate of the
-          temperature based upon the over temperature stage value.
-
 config GENERIC_ADC_THERMAL
         tristate "Generic ADC based thermal sensor"
         depends on IIO
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 0b5d33a49b3e..486d682be047 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -29,7 +29,6 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 
 # platform thermal drivers
 obj-y                           += broadcom/
-obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)      += qcom-spmi-temp-alarm.o
 obj-$(CONFIG_SPEAR_THERMAL)     += spear_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)  += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)      += rcar_thermal.o
diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
index be32e5abce3c..cdb455ffd575 100644
--- a/drivers/thermal/qcom/Kconfig
+++ b/drivers/thermal/qcom/Kconfig
@@ -9,3 +9,14 @@ config QCOM_TSENS
           thermal zone device via the mode file results in disabling the sensor.
           Also able to set threshold temperature for both hot and cold and update
           when a threshold is reached.
+
+config QCOM_SPMI_TEMP_ALARM
+        tristate "Qualcomm SPMI PMIC Temperature Alarm"
+        depends on OF && SPMI && IIO
+        select REGMAP_SPMI
+        help
+          This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
+          PMIC devices. It shows up in sysfs as a thermal sensor with multiple
+          trip points. The temperature reported by the thermal sensor reflects the
+          real time die temperature if an ADC is present or an estimate of the
+          temperature based upon the over temperature stage value.
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index a821929ede0b..717a08600bb5 100644
--- a/drivers/thermal/qcom/Makefile
+++ b/drivers/thermal/qcom/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_QCOM_TSENS)        += qcom_tsens.o
 qcom_tsens-y                    += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o
+obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)      += qcom-spmi-temp-alarm.o
diff --git a/drivers/thermal/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
index b2d5d5bf4a9b..c1fd71dbab3e 100644
--- a/drivers/thermal/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
@@ -23,7 +23,7 @@
 #include <linux/regmap.h>
 #include <linux/thermal.h>
 
-#include "thermal_core.h"
+#include "../thermal_core.h"
 
 #define QPNP_TM_REG_TYPE                0x04
 #define QPNP_TM_REG_SUBTYPE             0x05