diff --git a/[refs] b/[refs]
index dcec22bd6db3..bd58c20ca13b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03b79bda8d061d80a6106e257c072a2754141bab
+refs/heads/master: caa5cbd5a18a72bb6f5a5211ddeade71fdb2282d
diff --git a/trunk/drivers/thermal/exynos_thermal.c b/trunk/drivers/thermal/exynos_thermal.c
index e2ef8a3531ac..327102a4596a 100644
--- a/trunk/drivers/thermal/exynos_thermal.c
+++ b/trunk/drivers/thermal/exynos_thermal.c
@@ -808,8 +808,6 @@ static const struct of_device_id exynos_tmu_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, exynos_tmu_match);
-#else
-#define  exynos_tmu_match NULL
 #endif
 
 static struct platform_device_id exynos_tmu_driver_ids[] = {
@@ -1085,7 +1083,7 @@ static struct platform_driver exynos_tmu_driver = {
 		.name   = "exynos-tmu",
 		.owner  = THIS_MODULE,
 		.pm     = EXYNOS_TMU_PM,
-		.of_match_table = exynos_tmu_match,
+		.of_match_table = of_match_ptr(exynos_tmu_match),
 	},
 	.probe = exynos_tmu_probe,
 	.remove	= __devexit_p(exynos_tmu_remove),