diff options
| author | Linus Torvalds | 2005-12-12 05:23:25 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2005-12-12 05:23:25 +0100 |
| commit | fe3f2053fd42148b3ebb7b90de5f20eaf3393860 (patch) | |
| tree | 8915aff27ef95943659565eff008f4a81e00577a /drivers | |
| parent | Remove (at least temporarily) the "incomplete PFN mapping" support (diff) | |
| parent | [PATCH] ppc32: set smp_tb_synchronized on UP with SMP kernel (diff) | |
| download | kernel-qcow2-linux-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.tar.gz kernel-qcow2-linux-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.tar.xz kernel-qcow2-linux-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.zip | |
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[] = { }, /* 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, |