3 files changed, 21 insertions, 37 deletions

diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 5505bcffd7dd..16a001c71e2e 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -318,24 +318,6 @@ void __init early_init_devtree(void *params)
         pr_debug(" <- early_init_devtree()\n");
 }
 
-/**
- * Indicates whether the root node has a given value in its
- * compatible property.
- */
-int machine_is_compatible(const char *compat)
-{
-        struct device_node *root;
-        int rc = 0;
-
-        root = of_find_node_by_path("/");
-        if (root) {
-                rc = of_device_is_compatible(root, compat);
-                of_node_put(root);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(machine_is_compatible);
-
 /*******
  *
  * New implementation of the OF "find" APIs, return a refcounted
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 877fad9b3745..caeea9a5fcc2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -754,25 +754,6 @@ void __init early_init_devtree(void *params)
         DBG(" <- early_init_devtree()\n");
 }
 
-
-/**
- * Indicates whether the root node has a given value in its
- * compatible property.
- */
-int machine_is_compatible(const char *compat)
-{
-        struct device_node *root;
-        int rc = 0;
-
-        root = of_find_node_by_path("/");
-        if (root) {
-                rc = of_device_is_compatible(root, compat);
-                of_node_put(root);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(machine_is_compatible);
-
 /*******
  *
  * New implementation of the OF "find" APIs, return a refcounted
diff --git a/drivers/of/base.c b/drivers/of/base.c
index ec56739eb247..dba995b70b84 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -144,6 +144,27 @@ int of_device_is_compatible(const struct device_node *device,
 EXPORT_SYMBOL(of_device_is_compatible);
 
 /**
+ * machine_is_compatible - Test root of device tree for a given compatible value
+ * @compat: compatible string to look for in root node's compatible property.
+ *
+ * Returns true if the root node has the given value in its
+ * compatible property.
+ */
+int machine_is_compatible(const char *compat)
+{
+        struct device_node *root;
+        int rc = 0;
+
+        root = of_find_node_by_path("/");
+        if (root) {
+                rc = of_device_is_compatible(root, compat);
+                of_node_put(root);
+        }
+        return rc;
+}
+EXPORT_SYMBOL(machine_is_compatible);
+
+/**
  *  of_device_is_available - check if a device is available for use
  *
  *  @device: Node to check for availability