Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / powerpc / kernel / of_device.c

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index e8aa1f3675b7df719a1c081a3eb532f0b46d51d8..a464d67248dfd1c7f754095fa386aabf7cd33178 100644 (file)
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -27,7 +27,7 @@ const struct of_device_id *of_match_node(const struct of_device_id *matches,
                        match &= node->type
                                && !strcmp(matches->type, node->type);
                if (matches->compatible[0])
-                       match &= device_is_compatible(node,
+                       match &= of_device_is_compatible(node,
                                                      matches->compatible);
                if (match)
                        return matches;
@@ -120,8 +120,8 @@ void of_device_unregister(struct of_device *ofdev)
 }
 
 
-static ssize_t of_device_get_modalias(struct of_device *ofdev,
-                                       char *str, ssize_t len)
+ssize_t of_device_get_modalias(struct of_device *ofdev,
+                               char *str, ssize_t len)
 {
        const char *compat;
        int cplen, i;
@@ -132,7 +132,7 @@ static ssize_t of_device_get_modalias(struct of_device *ofdev,
                                ofdev->node->name, ofdev->node->type);
 
        /* Get compatible property if any */
-       compat = get_property(ofdev->node, "compatible", &cplen);
+       compat = of_get_property(ofdev->node, "compatible", &cplen);
        if (!compat)
                return csize;
 
@@ -194,7 +194,7 @@ int of_device_uevent(struct device *dev,
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-       compat = get_property(ofdev->node, "compatible", &cplen);
+       compat = of_get_property(ofdev->node, "compatible", &cplen);
        while (compat && *compat && cplen > 0) {
                if (add_uevent_var(envp, num_envp, &i,
                                   buffer, buffer_size, &length,
@@ -239,3 +239,4 @@ EXPORT_SYMBOL(of_dev_get);
 EXPORT_SYMBOL(of_dev_put);
 EXPORT_SYMBOL(of_release_dev);
 EXPORT_SYMBOL(of_device_uevent);
+EXPORT_SYMBOL(of_device_get_modalias);