Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

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

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index c987033714f6acbfcdf307c77e514c2c24baf8bb..0ff92c2080055c50e9a90518888be3155c1a0ad4 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -44,11 +44,11 @@
  * TODO:  - Check MPU structure version/signature
  *        - Add things like /sbin/overtemp for non-critical
  *          overtemp conditions so userland can take some policy
- *          decisions, like slewing down CPUs
+ *          decisions, like slowing down CPUs
  *       - Deal with fan and i2c failures in a better way
  *       - Maybe do a generic PID based on params used for
  *         U3 and Drives ? Definitely need to factor code a bit
- *          bettter... also make sensor detection more robust using
+ *          better... also make sensor detection more robust using
  *          the device-tree to probe for them
  *        - Figure out how to get the slots consumption and set the
  *          slots fan accordingly
@@ -91,7 +91,7 @@
  *
  *  Mar. 10, 2005 : 1.2
  *     - Add basic support for Xserve G5
- *     - Retreive pumps min/max from EEPROM image in device-tree (broken)
+ *     - Retrieve pumps min/max from EEPROM image in device-tree (broken)
  *     - Use min/max macros here or there
  *     - Latest darwin updated U3H min fan speed to 20% PWM
  *
@@ -375,7 +375,7 @@ static int read_smon_adc(struct cpu_pid_state *state, int chan)
                rc = i2c_master_send(state->monitor, buf, 2);
                if (rc <= 0)
                        goto error;
-               /* Wait for convertion */
+               /* Wait for conversion */
                msleep(1);
                /* Switch to data register */
                buf[0] = 4;
@@ -1192,7 +1192,7 @@ static int init_processor_state(struct cpu_pid_state *state, int index)
                err |= device_create_file(&of_dev->dev, &dev_attr_cpu1_intake_fan_rpm);
        }
        if (err)
-               printk(KERN_WARNING "Failed to create some of the atribute"
+               printk(KERN_WARNING "Failed to create some of the attribute"
                        "files for CPU %d\n", index);
 
        return 0;