aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:25 -0800
commitfe3f2053fd42148b3ebb7b90de5f20eaf3393860 (patch)
tree8915aff27ef95943659565eff008f4a81e00577a /drivers
parent7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 (diff)
parentef969434005e772218c0b8086539804605070fa8 (diff)
downloadlinux-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/windfarm_pm81.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 322c74b2687f4..80ddf9776bde2 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,