Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / powermac / setup.c

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 9deb274841f1198d52eb6b2cc4029a374cd1c7fc..d5aceb7fb1253b96c4706ffd6f062be14546188b 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -506,6 +506,15 @@ static int __init pmac_declare_of_platform_devices(void)
                of_platform_device_create(np, "smu", NULL);
                of_node_put(np);
        }
+       np = of_find_node_by_type(NULL, "fcu");
+       if (np == NULL) {
+               /* Some machines have strangely broken device-tree */
+               np = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/fan@15e");
+       }
+       if (np) {
+               of_platform_device_create(np, "temperature", NULL);
+               of_node_put(np);
+       }
 
        return 0;
 }