From effde1e7a72b92f71547e71732a4412ab946a622 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 14 Mar 2013 15:31:50 +0530
Subject: [PATCH] --- yaml --- r: 365221 b: refs/heads/master c:
 9547acce669ec7b5613eb9be0838bff47258ccbf h: refs/heads/master i:   365219:
 1e42103ce8a25ca4fcb0822cbc4fb7726e093cce v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi-oc-tiny.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c3044688d31e..01850cebaf36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff23fa3bb05b296eeab2ccde92c0cdbc05942a1c
+refs/heads/master: 9547acce669ec7b5613eb9be0838bff47258ccbf
diff --git a/trunk/drivers/spi/spi-oc-tiny.c b/trunk/drivers/spi/spi-oc-tiny.c
index cb2e284bd814..e60a776ed2d4 100644
--- a/trunk/drivers/spi/spi-oc-tiny.c
+++ b/trunk/drivers/spi/spi-oc-tiny.c
@@ -393,8 +393,6 @@ static const struct of_device_id tiny_spi_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, tiny_spi_match);
-#else /* CONFIG_OF */
-#define tiny_spi_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver tiny_spi_driver = {
@@ -404,7 +402,7 @@ static struct platform_driver tiny_spi_driver = {
 		.name = DRV_NAME,
 		.owner = THIS_MODULE,
 		.pm = NULL,
-		.of_match_table = tiny_spi_match,
+		.of_match_table = of_match_ptr(tiny_spi_match),
 	},
 };
 module_platform_driver(tiny_spi_driver);