Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / macintosh / windfarm_smu_controls.c

diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index 58c2590f05ecd587770127ffeb55ee37b7c55cc3..961fa0e7c2cf76b3607fe02707d64275192d6f4d 100644 (file)
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -218,6 +218,10 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                fct->ctrl.name = "cpu-fan";
        else if (!strcmp(l, "Hard Drive") || !strcmp(l, "Hard drive"))
                fct->ctrl.name = "drive-bay-fan";
+       else if (!strcmp(l, "HDD Fan")) /* seen on iMac G5 iSight */
+               fct->ctrl.name = "hard-drive-fan";
+       else if (!strcmp(l, "ODD Fan")) /* same */
+               fct->ctrl.name = "optical-drive-fan";
 
        /* Unrecognized fan, bail out */
        if (fct->ctrl.name == NULL)