From c80960718297c860b66a2f8e54daeada3eaf9b59 Mon Sep 17 00:00:00 2001
From: Sinan Akman <sinan@writeme.com>
Date: Sat, 2 Oct 2010 21:28:29 -0600
Subject: [PATCH] --- yaml --- r: 211246 b: refs/heads/master c:
 2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/spi/spi.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b61b0d02f927..270c4bb32a02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23699f98f84f20195fddd0263d05a8ccb8694676
+refs/heads/master: 2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 0bcf4c1601a2..b5a78a1f4421 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/cache.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
@@ -86,6 +87,10 @@ static int spi_match_device(struct device *dev, struct device_driver *drv)
 	const struct spi_device	*spi = to_spi_device(dev);
 	const struct spi_driver	*sdrv = to_spi_driver(drv);
 
+	/* Attempt an OF style match */
+	if (of_driver_match_device(dev, drv))
+		return 1;
+
 	if (sdrv->id_table)
 		return !!spi_match_id(sdrv->id_table, spi);