From c2b9de0148bacae7bae223eb2f6a6edd44673fb5 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 19 Dec 2012 14:20:59 +0530
Subject: [PATCH] --- yaml --- r: 359761 b: refs/heads/master c:
 c076fc42a4d6c51d6422aaf9f6626bf1adf983e7 h: refs/heads/master i:   359759:
 0355e2ad0f46a607516985ab67dc9da5cda1713e v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/thermal/db8500_cpufreq_cooling.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2d369f39c7a0..08d49bedd4d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c313637641c3e33388903e16cfde97b2e67adb9e
+refs/heads/master: c076fc42a4d6c51d6422aaf9f6626bf1adf983e7
diff --git a/trunk/drivers/thermal/db8500_cpufreq_cooling.c b/trunk/drivers/thermal/db8500_cpufreq_cooling.c
index 4cf8e72af90a..21419851fc02 100644
--- a/trunk/drivers/thermal/db8500_cpufreq_cooling.c
+++ b/trunk/drivers/thermal/db8500_cpufreq_cooling.c
@@ -21,6 +21,7 @@
 #include <linux/cpufreq.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
@@ -73,15 +74,13 @@ static const struct of_device_id db8500_cpufreq_cooling_match[] = {
 	{ .compatible = "stericsson,db8500-cpufreq-cooling" },
 	{},
 };
-#else
-#define db8500_cpufreq_cooling_match NULL
 #endif
 
 static struct platform_driver db8500_cpufreq_cooling_driver = {
 	.driver = {
 		.owner = THIS_MODULE,
 		.name = "db8500-cpufreq-cooling",
-		.of_match_table = db8500_cpufreq_cooling_match,
+		.of_match_table = of_match_ptr(db8500_cpufreq_cooling_match),
 	},
 	.probe = db8500_cpufreq_cooling_probe,
 	.suspend = db8500_cpufreq_cooling_suspend,