lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linux-2.6'

Browse Source
This commit is contained in:
Paul Mackerras
2006-09-14 07:07:18 +10:00
parent 3dd836a56d 63b98080da
commit c547fc28ab
295 changed files with 3615 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/macintosh/via-pmu.c
View File

@ -1995,6 +1995,8 @@ restore_via_state(void)
out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
}
extern void pmu_backlight_set_sleep(int sleep);
static int
pmac_suspend_devices(void)
{
@ -2032,6 +2034,11 @@ pmac_suspend_devices(void)
return -EBUSY;
}
#ifdef CONFIG_PMAC_BACKLIGHT
/* Tell backlight code not to muck around with the chip anymore */
pmu_backlight_set_sleep(1);
#endif
/* Call platform functions marked "on sleep" */
pmac_pfunc_i2c_suspend();
pmac_pfunc_base_suspend();
@ -2090,6 +2097,11 @@ pmac_wakeup_devices(void)
{
mdelay(100);
#ifdef CONFIG_PMAC_BACKLIGHT
/* Tell backlight code it can use the chip again */
pmu_backlight_set_sleep(0);
#endif
/* Power back up system devices (including the PIC) */
device_power_up();