Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / arch / powerpc / platforms / powermac / pfunc_core.c

diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 7651f278615a307dd701fe900a6bcc6b5fbf67bc..96d5ce50364eab840571b216c10819e71834408d 100644 (file)
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 
-#include <asm/semaphore.h>
 #include <asm/prom.h>
 #include <asm/pmac_pfunc.h>
 
@@ -692,8 +691,7 @@ static int pmf_add_functions(struct pmf_device *dev, void *driverdata)
                name = pp->name + plen;
                if (strlen(name) && pp->length >= 12)
                        count += pmf_add_function_prop(dev, driverdata, name,
-                                                      (u32 *)pp->value,
-                                                      pp->length);
+                                                      pp->value, pp->length);
        }
        return count;
 }
@@ -821,7 +819,7 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
         * one, then we fallback to a direct call attempt
         */
        snprintf(fname, 63, "platform-%s", name);
-       prop = get_property(target, fname, NULL);
+       prop = of_get_property(target, fname, NULL);
        if (prop == NULL)
                goto find_it;
        ph = *prop;