diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
| commit | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (patch) | |
| tree | f2f8e838d36722d39d62eb7eec7a1b3ad29d0d5a /drivers/acpi/sleep/wakeup.c | |
| parent | c30c620ee1cc351bcc149c4280e1166998df0064 (diff) | |
| parent | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (diff) | |
Pull kconfig into release branch
Diffstat (limited to 'drivers/acpi/sleep/wakeup.c')
| -rw-r--r-- | drivers/acpi/sleep/wakeup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c index fab8f2694f03..97c27ddb144d 100644 --- a/drivers/acpi/sleep/wakeup.c +++ b/drivers/acpi/sleep/wakeup.c | |||
| @@ -17,7 +17,6 @@ ACPI_MODULE_NAME("wakeup_devices") | |||
| 17 | extern struct list_head acpi_wakeup_device_list; | 17 | extern struct list_head acpi_wakeup_device_list; |
| 18 | extern spinlock_t acpi_device_lock; | 18 | extern spinlock_t acpi_device_lock; |
| 19 | 19 | ||
| 20 | #ifdef CONFIG_ACPI_SLEEP | ||
| 21 | /** | 20 | /** |
| 22 | * acpi_enable_wakeup_device_prep - prepare wakeup devices | 21 | * acpi_enable_wakeup_device_prep - prepare wakeup devices |
| 23 | * @sleep_state: ACPI state | 22 | * @sleep_state: ACPI state |
| @@ -180,7 +179,6 @@ static int __init acpi_wakeup_device_init(void) | |||
| 180 | } | 179 | } |
| 181 | 180 | ||
| 182 | late_initcall(acpi_wakeup_device_init); | 181 | late_initcall(acpi_wakeup_device_init); |
| 183 | #endif | ||
| 184 | 182 | ||
| 185 | /* | 183 | /* |
| 186 | * Disable all wakeup GPEs before entering requested sleep state. | 184 | * Disable all wakeup GPEs before entering requested sleep state. |