aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-25 01:35:25 -0400
committerLen Brown <len.brown@intel.com>2007-07-25 01:35:25 -0400
commit1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (patch)
treef2f8e838d36722d39d62eb7eec7a1b3ad29d0d5a /include/acpi
parentc30c620ee1cc351bcc149c4280e1166998df0064 (diff)
parente8b2fd01228f690c3e0cb3f14facfa8d93d4adae (diff)
Pull kconfig into release branch
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_drivers.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 553515912c0b..07b5d76b92cc 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -142,10 +142,6 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
142/*-------------------------------------------------------------------------- 142/*--------------------------------------------------------------------------
143 Suspend/Resume 143 Suspend/Resume
144 -------------------------------------------------------------------------- */ 144 -------------------------------------------------------------------------- */
145#ifdef CONFIG_ACPI_SLEEP
146extern int acpi_sleep_init(void); 145extern int acpi_sleep_init(void);
147#else
148#define acpi_sleep_init() do {} while (0)
149#endif
150 146
151#endif /*__ACPI_DRIVERS_H__*/ 147#endif /*__ACPI_DRIVERS_H__*/