diff options
author | Len Brown <len.brown@intel.com> | 2007-07-28 03:33:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:53:59 -0400 |
commit | 673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch) | |
tree | a795ee922db699a8b4cb893ef5809399f1591ba6 /include/acpi/acpi_drivers.h | |
parent | 296699de6bdc717189a331ab6bbe90e05c94db06 (diff) |
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the
new CONFIG_PM_SLEEP option.
Signed-off-by: Len Brown <len.brown@intel.com>
[ Modified to work with the PM config setup changes. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/acpi/acpi_drivers.h')
-rw-r--r-- | include/acpi/acpi_drivers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 777d37ae81a2..202acb9ff4d0 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -147,7 +147,7 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) | |||
147 | /*-------------------------------------------------------------------------- | 147 | /*-------------------------------------------------------------------------- |
148 | Suspend/Resume | 148 | Suspend/Resume |
149 | -------------------------------------------------------------------------- */ | 149 | -------------------------------------------------------------------------- */ |
150 | #ifdef CONFIG_PM_SLEEP | 150 | #ifdef CONFIG_ACPI_SLEEP |
151 | extern int acpi_sleep_init(void); | 151 | extern int acpi_sleep_init(void); |
152 | #else | 152 | #else |
153 | static inline int acpi_sleep_init(void) { return 0; } | 153 | static inline int acpi_sleep_init(void) { return 0; } |