Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[~andy/linux] / drivers / macintosh / windfarm_lm75_sensor.c

diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 4cc3f935709d19ba2b6b30452ea061d5c0f17967..b0c2d3695b347fc1e5c8f16c22527903ecfa1630 100644 (file)
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -116,6 +116,12 @@ static int wf_lm75_probe(struct i2c_client *client,
                name = "optical-drive-temp";
        else if (!strcmp(loc, "HD Temp"))
                name = "hard-drive-temp";
+       else if (!strcmp(loc, "PCI SLOTS"))
+               name = "slots-temp";
+       else if (!strcmp(loc, "CPU A INLET"))
+               name = "cpu-inlet-temp-0";
+       else if (!strcmp(loc, "CPU B INLET"))
+               name = "cpu-inlet-temp-1";
        else
                return -ENXIO;
        
@@ -170,11 +176,6 @@ static struct i2c_driver wf_lm75_driver = {
 
 static int __init wf_lm75_sensor_init(void)
 {
-       /* Don't register on old machines that use therm_pm72 for now */
-       if (of_machine_is_compatible("PowerMac7,2") ||
-           of_machine_is_compatible("PowerMac7,3") ||
-           of_machine_is_compatible("RackMac3,1"))
-               return -ENODEV;
        return i2c_add_driver(&wf_lm75_driver);
 }