---

yaml --- r: 346447 b: refs/heads/master c: 04a373f h: refs/heads/master i: 346445: 5106b98 346443: 6147610 346439: 4d46f83 346431: ef62097 v: v3
git-mirror · Dec 18, 2012 · 63ec31a · 63ec31a
1 parent 483c7f4
commit 63ec31a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18c701a9dbe91768e1629f1aece9d50543b3abfa
+refs/heads/master: 04a373fdc9b0cbb4f076dd0e6c6433dc3bc48724
diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c
@@ -663,8 +663,6 @@ static const struct of_device_id s3c_rtc_dt_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
-#else
-#define s3c_rtc_dt_match NULL
 #endif
 
 static struct platform_device_id s3c_rtc_driver_ids[] = {
@@ -695,7 +693,7 @@ static struct platform_driver s3c_rtc_driver = {
 	.driver		= {
 		.name	= "s3c-rtc",
 		.owner	= THIS_MODULE,
-		.of_match_table	= s3c_rtc_dt_match,
+		.of_match_table	= of_match_ptr(s3c_rtc_dt_match),
 	},
 };