From c1b9f4723e03024824f53d244a22ec93e8d5ea7e Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 3 Aug 2011 10:11:43 +0100
Subject: [PATCH] --- yaml --- r: 269370 b: refs/heads/master c:
 85888069cf5d0f21312e3ee730458a5e3a553509 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ad7d3cbadeb1..e5b81f183bc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a1e362e3f3cd571b3974b8d44b8e358ec7a098c
+refs/heads/master: 85888069cf5d0f21312e3ee730458a5e3a553509
diff --git a/trunk/drivers/tty/serial/altera_jtaguart.c b/trunk/drivers/tty/serial/altera_jtaguart.c
index 60e049b041a7..207520069256 100644
--- a/trunk/drivers/tty/serial/altera_jtaguart.c
+++ b/trunk/drivers/tty/serial/altera_jtaguart.c
@@ -472,8 +472,6 @@ static struct of_device_id altera_jtaguart_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
-#else
-#define altera_jtaguart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_jtaguart_platform_driver = {
@@ -482,7 +480,7 @@ static struct platform_driver altera_jtaguart_platform_driver = {
 	.driver	= {
 		.name		= DRV_NAME,
 		.owner		= THIS_MODULE,
-		.of_match_table	= altera_jtaguart_match,
+		.of_match_table	= of_match_ptr(altera_jtaguart_match),
 	},
 };
 
diff --git a/trunk/drivers/tty/serial/altera_uart.c b/trunk/drivers/tty/serial/altera_uart.c
index 50bc5a5ac653..0abd31d2361b 100644
--- a/trunk/drivers/tty/serial/altera_uart.c
+++ b/trunk/drivers/tty/serial/altera_uart.c
@@ -616,8 +616,6 @@ static struct of_device_id altera_uart_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_uart_match);
-#else
-#define altera_uart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_uart_platform_driver = {
@@ -626,7 +624,7 @@ static struct platform_driver altera_uart_platform_driver = {
 	.driver	= {
 		.name		= DRV_NAME,
 		.owner		= THIS_MODULE,
-		.of_match_table	= altera_uart_match,
+		.of_match_table	= of_match_ptr(altera_uart_match),
 	},
 };
 
diff --git a/trunk/drivers/tty/serial/uartlite.c b/trunk/drivers/tty/serial/uartlite.c
index 8af1ed83a4c0..0aed022d21b7 100644
--- a/trunk/drivers/tty/serial/uartlite.c
+++ b/trunk/drivers/tty/serial/uartlite.c
@@ -568,8 +568,6 @@ static struct of_device_id ulite_of_match[] __devinitdata = {
 	{}
 };
 MODULE_DEVICE_TABLE(of, ulite_of_match);
-#else /* CONFIG_OF */
-#define ulite_of_match NULL
 #endif /* CONFIG_OF */
 
 static int __devinit ulite_probe(struct platform_device *pdev)
@@ -609,7 +607,7 @@ static struct platform_driver ulite_platform_driver = {
 	.driver = {
 		.owner = THIS_MODULE,
 		.name  = "uartlite",
-		.of_match_table = ulite_of_match,
+		.of_match_table = of_match_ptr(ulite_of_match),
 	},
 };