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 /arch/ia64/kernel/acpi.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 'arch/ia64/kernel/acpi.c')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 103dd8edda71..c6ede8780ded 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -67,6 +67,8 @@ EXPORT_SYMBOL(pm_power_off); | |||
67 | unsigned int acpi_cpei_override; | 67 | unsigned int acpi_cpei_override; |
68 | unsigned int acpi_cpei_phys_cpuid; | 68 | unsigned int acpi_cpei_phys_cpuid; |
69 | 69 | ||
70 | unsigned long acpi_wakeup_address = 0; | ||
71 | |||
70 | const char __init * | 72 | const char __init * |
71 | acpi_get_sysname(void) | 73 | acpi_get_sysname(void) |
72 | { | 74 | { |
@@ -986,4 +988,21 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) | |||
986 | 988 | ||
987 | EXPORT_SYMBOL(acpi_unregister_ioapic); | 989 | EXPORT_SYMBOL(acpi_unregister_ioapic); |
988 | 990 | ||
991 | /* | ||
992 | * acpi_save_state_mem() - save kernel state | ||
993 | * | ||
994 | * TBD when when IA64 starts to support suspend... | ||
995 | */ | ||
996 | int acpi_save_state_mem(void) { return 0; } | ||
997 | |||
998 | /* | ||
999 | * acpi_restore_state() | ||
1000 | */ | ||
1001 | void acpi_restore_state_mem(void) {} | ||
1002 | |||
1003 | /* | ||
1004 | * do_suspend_lowlevel() | ||
1005 | */ | ||
1006 | void do_suspend_lowlevel(void) {} | ||
1007 | |||
989 | #endif /* CONFIG_ACPI */ | 1008 | #endif /* CONFIG_ACPI */ |