From 78758dc45091e98ce60891d22e97e0fe89cdfda4 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 7 Jan 2013 09:50:42 +0530
Subject: [PATCH] --- yaml --- r: 354755 b: refs/heads/master c:
 905f4ba252f933344e43a32ef4524bc8412c2e90 h: refs/heads/master i:   354753:
 fff28a224dafe79d363a1398f0a556e72635c81b   354751:
 ae94311d87839d9afdf5d617aaaddd7482f22363 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/samsung.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 12a282e8d29b..afeb1cc045bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41147bfdc5c0d6acb39d2b3b8a4eb6ffb08e4b42
+refs/heads/master: 905f4ba252f933344e43a32ef4524bc8412c2e90
diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c
index 96ae08f34770..0684529eb2ad 100644
--- a/trunk/drivers/tty/serial/samsung.c
+++ b/trunk/drivers/tty/serial/samsung.c
@@ -1729,8 +1729,6 @@ static const struct of_device_id s3c24xx_uart_dt_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
-#else
-#define s3c24xx_uart_dt_match NULL
 #endif
 
 static struct platform_driver samsung_serial_driver = {
@@ -1741,7 +1739,7 @@ static struct platform_driver samsung_serial_driver = {
 		.name	= "samsung-uart",
 		.owner	= THIS_MODULE,
 		.pm	= SERIAL_SAMSUNG_PM_OPS,
-		.of_match_table	= s3c24xx_uart_dt_match,
+		.of_match_table	= of_match_ptr(s3c24xx_uart_dt_match),
 	},
 };