diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/macintosh/via-pmu.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 4a0a0ad2d03c..645a2e5c70ab 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
| @@ -3065,7 +3065,7 @@ static int pmu_sys_suspended = 0; | |||
| 3065 | 3065 | ||
| 3066 | static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state) | 3066 | static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state) |
| 3067 | { | 3067 | { |
| 3068 | if (state != PM_SUSPEND_DISK || pmu_sys_suspended) | 3068 | if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended) |
| 3069 | return 0; | 3069 | return 0; |
| 3070 | 3070 | ||
| 3071 | /* Suspend PMU event interrupts */ | 3071 | /* Suspend PMU event interrupts */ |