X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fof%2Fdevice.c;h=29681c4b700b13d2fa8b4f106b40faceec403716;hb=2d9b57fbec9fde4deea3686f3927204efa218c7f;hp=7f233d77d62f8bb212049a4138a7134da6d90d22;hpb=f85ff3056cefdf4635ebf98b30e9a7d86521567f;p=linux-2.6

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 7f233d77d6..29681c4b70 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -1,42 +1,13 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 
 #include <asm/errno.h>
-#include <asm/of_device.h>
-
-/**
- * of_match_node - Tell if an device_node has a matching of_match structure
- * @ids: array of of device match structures to search in
- * @node: the of device structure to match against
- *
- * Low level utility function used by device matching.
- */
-const struct of_device_id *of_match_node(const struct of_device_id *matches,
-					 const struct device_node *node)
-{
-	while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
-		int match = 1;
-		if (matches->name[0])
-			match &= node->name
-				&& !strcmp(matches->name, node->name);
-		if (matches->type[0])
-			match &= node->type
-				&& !strcmp(matches->type, node->type);
-		if (matches->compatible[0])
-			match &= of_device_is_compatible(node,
-						matches->compatible);
-		if (match)
-			return matches;
-		matches++;
-	}
-	return NULL;
-}
-EXPORT_SYMBOL(of_match_node);
 
 /**
  * of_match_device - Tell if an of_device structure has a matching