From c36d239b4c35a333cfdef5ea3234968ee6b86899 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 16 Mar 2012 23:31:25 -0700
Subject: [PATCH] --- yaml --- r: 294040 b: refs/heads/master c:
 14b5842ebf552d242b0238f70d0730a564065fb0 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/input/serio/altera_ps2.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a23b7cd662a..c65c46090a81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a53383565e340254479ce4d47bc181884ddf6c3
+refs/heads/master: 14b5842ebf552d242b0238f70d0730a564065fb0
diff --git a/trunk/drivers/input/serio/altera_ps2.c b/trunk/drivers/input/serio/altera_ps2.c
index 35864c6130bb..cc11f4efe119 100644
--- a/trunk/drivers/input/serio/altera_ps2.c
+++ b/trunk/drivers/input/serio/altera_ps2.c
@@ -180,8 +180,6 @@ static const struct of_device_id altera_ps2_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_ps2_match);
-#else /* CONFIG_OF */
-#define altera_ps2_match NULL
 #endif /* CONFIG_OF */
 
 /*
@@ -193,7 +191,7 @@ static struct platform_driver altera_ps2_driver = {
 	.driver	= {
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,
-		.of_match_table = altera_ps2_match,
+		.of_match_table = of_match_ptr(altera_ps2_match),
 	},
 };
 module_platform_driver(altera_ps2_driver);