diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-24 22:26:33 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:29:39 -0400 |
| commit | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch) | |
| tree | fb69560e2a584a8ca82985a99e42ec189d592091 /drivers/acpi/sleep/main.c | |
| parent | 7c5aa6642fa26641ebf286966a165aec71c91991 (diff) | |
| download | lwn-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.tar.gz lwn-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.zip | |
ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source
As it was a synonym for (CONFIG_ACPI && CONFIG_X86),
the ifdefs for it were more clutter than they were worth.
For ia64, just add a few stubs in anticipation of future
S3 or S4 support.
Signed-off-by: Len Brown <len.brown@intel.com>
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 3279e72a94f8..54c2dfcf8651 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; } |