diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 23:23:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 23:23:25 -0500 |
| commit | fe3f2053fd42148b3ebb7b90de5f20eaf3393860 (patch) | |
| tree | 8915aff27ef95943659565eff008f4a81e00577a /drivers | |
| parent | 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 (diff) | |
| parent | ef969434005e772218c0b8086539804605070fa8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/windfarm_pm81.c | 4 |
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[] = { | |||
| 207 | }, | 207 | }, |
| 208 | /* Model ID 3 */ | 208 | /* Model ID 3 */ |
| 209 | { | 209 | { |
| 210 | .model_id = 2, | 210 | .model_id = 3, |
| 211 | .itarget = 0x350000, | 211 | .itarget = 0x350000, |
| 212 | .gd = 0x08e00000, | 212 | .gd = 0x08e00000, |
| 213 | .gp = 0x00566666, | 213 | .gp = 0x00566666, |
| @@ -219,7 +219,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | |||
| 219 | }, | 219 | }, |
| 220 | /* Model ID 5 */ | 220 | /* Model ID 5 */ |
| 221 | { | 221 | { |
| 222 | .model_id = 2, | 222 | .model_id = 5, |
| 223 | .itarget = 0x3a0000, | 223 | .itarget = 0x3a0000, |
| 224 | .gd = 0x15400000, | 224 | .gd = 0x15400000, |
| 225 | .gp = 0x00233333, | 225 | .gp = 0x00233333, |