From 2732483886277d89db441d788d1e99cd081f6ac6 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Thu, 3 May 2012 05:24:17 +0000
Subject: [PATCH] --- yaml --- r: 305879 b: refs/heads/master c:
 3016a552a8314b2734aed0a1acbb983459e2acc4 h: refs/heads/master i:   305877:
 7a174bb4fb1f804ad7916134ed05961afe1c8ea1   305875:
 5d1e7cb6a3e4d3b8219cff44a52a9e447c24d62c   305871:
 fdfde209ab0324f2b12030f76db91abde49f4284 v: v3

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

diff --git a/[refs] b/[refs]
index fe5abb7557c1..87db52850a27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ba3774b8c433fe9e91158d65cf2324ff0c5a15d
+refs/heads/master: 3016a552a8314b2734aed0a1acbb983459e2acc4
diff --git a/trunk/drivers/watchdog/s3c2410_wdt.c b/trunk/drivers/watchdog/s3c2410_wdt.c
index 04e5a6de47d7..d277cd614daf 100644
--- a/trunk/drivers/watchdog/s3c2410_wdt.c
+++ b/trunk/drivers/watchdog/s3c2410_wdt.c
@@ -40,6 +40,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/of.h>
 
 #include <mach/map.h>
 
@@ -503,8 +504,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
-#else
-#define s3c2410_wdt_match NULL
 #endif
 
 static struct platform_driver s3c2410wdt_driver = {
@@ -516,7 +515,7 @@ static struct platform_driver s3c2410wdt_driver = {
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "s3c2410-wdt",
-		.of_match_table	= s3c2410_wdt_match,
+		.of_match_table	= of_match_ptr(s3c2410_wdt_match),
 	},
 };