Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux-2.6] / drivers / macintosh / windfarm_lm75_sensor.c

diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 3f7967feaf5b7e7900c3134e40cb5b3f33fef493..ab4d1b63f63e673c70f3321a837cc4f029a380c4 100644 (file)
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -176,7 +176,7 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
        for (dev = NULL;
             (dev = of_get_next_child(busnode, dev)) != NULL;) {
                const char *loc =
-                       get_property(dev, "hwsensor-location", NULL);
+                       of_get_property(dev, "hwsensor-location", NULL);
                u8 addr;
 
                /* We must re-match the adapter in order to properly check