diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/macintosh/windfarm_pm81.c | |
parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/macintosh/windfarm_pm81.c')
-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 f1df6efcbe68..2ff546e4c92f 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -396,7 +396,7 @@ static void wf_smu_sys_fans_tick(struct wf_smu_sys_fans_state *st) | |||
396 | static void wf_smu_create_cpu_fans(void) | 396 | static void wf_smu_create_cpu_fans(void) |
397 | { | 397 | { |
398 | struct wf_cpu_pid_param pid_param; | 398 | struct wf_cpu_pid_param pid_param; |
399 | struct smu_sdbp_header *hdr; | 399 | const struct smu_sdbp_header *hdr; |
400 | struct smu_sdbp_cpupiddata *piddata; | 400 | struct smu_sdbp_cpupiddata *piddata; |
401 | struct smu_sdbp_fvt *fvt; | 401 | struct smu_sdbp_fvt *fvt; |
402 | s32 tmax, tdelta, maxpow, powadj; | 402 | s32 tmax, tdelta, maxpow, powadj; |
@@ -702,7 +702,7 @@ static struct notifier_block wf_smu_events = { | |||
702 | 702 | ||
703 | static int wf_init_pm(void) | 703 | static int wf_init_pm(void) |
704 | { | 704 | { |
705 | struct smu_sdbp_header *hdr; | 705 | const struct smu_sdbp_header *hdr; |
706 | 706 | ||
707 | hdr = smu_get_sdb_partition(SMU_SDB_SENSORTREE_ID, NULL); | 707 | hdr = smu_get_sdb_partition(SMU_SDB_SENSORTREE_ID, NULL); |
708 | if (hdr != 0) { | 708 | if (hdr != 0) { |