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) |
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) | |||
136 | /* reset firmware waking vector */ | 136 | /* reset firmware waking vector */ |
137 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); | 137 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); |
138 | 138 | ||
139 | #ifdef CONFIG_X86 | ||
139 | if (init_8259A_after_S1) { | 140 | if (init_8259A_after_S1) { |
140 | printk("Broken toshiba laptop -> kicking interrupts\n"); | 141 | printk("Broken toshiba laptop -> kicking interrupts\n"); |
141 | init_8259A(0); | 142 | init_8259A(0); |
142 | } | 143 | } |
144 | #endif | ||
143 | return 0; | 145 | return 0; |
144 | } | 146 | } |
145 | 147 | ||