diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:56:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:56:28 -0700 |
| commit | 1f23f4209f2b99fdddf09821eead6364a6dd9654 (patch) | |
| tree | 55ea6a59166d1690346304f6c0fb7e6d52cdbe6c /include | |
| parent | e4b42be77ecc663550b515fcb7761b01fac0f272 (diff) | |
| parent | 78e1ca49c7ead5cd00882ed0c776260857613122 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0
ACPI: CONFIG_ACPI_SLEEP=n power off regression in 2.6.23-rc8 (NOT in rc7)
ACPI: suspend: build-fix for CONFIG_SUSPEND=n and CONFIG_HIBERNATION=y
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 202acb9ff4d0..f85f77a538aa 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -147,10 +147,6 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) /*-------------------------------------------------------------------------- Suspend/Resume -------------------------------------------------------------------------- */ -#ifdef CONFIG_ACPI_SLEEP extern int acpi_sleep_init(void); -#else -static inline int acpi_sleep_init(void) { return 0; } -#endif #endif /*__ACPI_DRIVERS_H__*/ |