Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[mv-sheeva.git] / drivers / macintosh / windfarm_pm121.c

diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c
index 66ec4fb115bb203a3c566cead227e650386b8d4d..947d4afa25ca9abfe199ffea35f2233e944c9498 100644 (file)
--- a/drivers/macintosh/windfarm_pm121.c
+++ b/drivers/macintosh/windfarm_pm121.c
@@ -1008,7 +1008,7 @@ static int __init pm121_init(void)
 {
        int rc = -ENODEV;
 
-       if (machine_is_compatible("PowerMac12,1"))
+       if (of_machine_is_compatible("PowerMac12,1"))
                rc = pm121_init_pm();
 
        if (rc == 0) {