From c0379c051fa78d3b4ca6f9edde2d7011390f3a86 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 8 Jun 2010 07:48:20 -0600
Subject: [PATCH] --- yaml --- r: 204927 b: refs/heads/master c:
 05212157e94ccf4cf458413bbba509cfa95ff92b h: refs/heads/master i:   204925:
 1ddc683d8791d6d23eb3efd54472a7ec4006edbd   204923:
 9de45d867389117e74d7a5b2272f25722f1e9ad5   204919:
 55e2338f9f795e7cbfca084b9a04456b741b96f5   204911:
 2f9da15e89532733d38f4b03369e257af820b79c   204895:
 d0578a57d9b3794faaf722b2fc63da98057bdc89   204863:
 a56e24aeab4dbd1ac8fd1d855bbc8c4c306c4a43   204799:
 77a3bfc9b2bd0f8e7306833c600a4ee3673b44dc v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/base/platform.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd68bcd410b1..924ca0fd1802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4f62bf7396fca48efe61513640ee399a6046e3
+refs/heads/master: 05212157e94ccf4cf458413bbba509cfa95ff92b
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 4d99c8bdfedc..fac3633c7223 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -12,6 +12,7 @@
 
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/of_device.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
@@ -673,7 +674,11 @@ static int platform_match(struct device *dev, struct device_driver *drv)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct platform_driver *pdrv = to_platform_driver(drv);
 
-	/* match against the id table first */
+	/* Attempt an OF style match first */
+	if (of_driver_match_device(dev, drv))
+		return 1;
+
+	/* Then try to match against the id table */
 	if (pdrv->id_table)
 		return platform_match_id(pdrv->id_table, pdev) != NULL;