Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 322c74b2687f..80ddf9776bde 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -207,7 +207,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
         },
         /* Model ID 3 */
         {
-                .model_id       = 2,
+                .model_id       = 3,
                 .itarget        = 0x350000,
                 .gd             = 0x08e00000,
                 .gp             = 0x00566666,
@@ -219,7 +219,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
         },
         /* Model ID 5 */
         {
-                .model_id       = 2,
+                .model_id       = 5,
                 .itarget        = 0x3a0000,
                 .gd             = 0x15400000,
                 .gp             = 0x00233333,