diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 05:35:25 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 05:35:25 (GMT) |
| commit | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (patch) | |
| tree | f2f8e838d36722d39d62eb7eec7a1b3ad29d0d5a /drivers/acpi/sleep/main.c | |
| parent | c30c620ee1cc351bcc149c4280e1166998df0064 (diff) | |
| parent | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (diff) | |
| download | linux-fsl-qoriq-1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c.tar.xz | |
Pull kconfig into release branch
Diffstat (limited to 'drivers/acpi/sleep/main.c')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 3279e72..54c2dfc 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -136,10 +136,12 @@ static int acpi_pm_finish(suspend_state_t pm_state) /* reset firmware waking vector */ acpi_set_firmware_waking_vector((acpi_physical_address) 0); +#ifdef CONFIG_X86 if (init_8259A_after_S1) { printk("Broken toshiba laptop -> kicking interrupts\n"); init_8259A(0); } +#endif return 0; } |