Fix for compiler error

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e3b1efc21f77b391e0b0e2e257cec7a85a22ada4..fa2fc3cc643050dcac7ba8f109b03449b5c14bcf 100644 (file)
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 
 #include <mach/map.h>
+#include <mach/regs-pmu.h>
 #include <linux/platform_data/usb-exynos.h>
 #include <linux/platform_data/samsung-usbphy.h>
 

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 91b34812cd8478a2aacfbdacc6818c75e4bfe587..b11bfeca330c9b6eb31155d088f0869677a3dfcd 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -48,6 +48,8 @@ enum thermal_trend {
        THERMAL_TREND_STABLE, /* temperature is stable */
        THERMAL_TREND_RAISING, /* temperature is raising */
        THERMAL_TREND_DROPPING, /* temperature is dropping */
+       THERMAL_TREND_DROP_FULL,
+       THERMAL_TREND_RAISE_FULL,
 };
 
 struct thermal_zone_device_ops {