Merge Linus' tree.

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

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a83c4acf57100f35a813bf8324047b8f0d2d9168..e8378274d710f02f0d93facd8de2fa050ec6e4f4 100644 (file)
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -590,6 +590,8 @@ static void smu_expose_childs(void *unused)
                        sprintf(name, "smu-i2c-%02x", *reg);
                        of_platform_device_create(np, name, &smu->of_dev->dev);
                }
+               if (device_is_compatible(np, "smu-sensors"))
+                       of_platform_device_create(np, "smu-sensors", &smu->of_dev->dev);
        }
 
 }