diff options
Diffstat (limited to 'drivers/acpi/wakeup.c')
-rw-r--r-- | drivers/acpi/wakeup.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index 2d34806d45dd..5aee8c26cc9f 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c | |||
@@ -8,6 +8,8 @@ | |||
8 | #include <acpi/acpi_drivers.h> | 8 | #include <acpi/acpi_drivers.h> |
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | |||
12 | #include "internal.h" | ||
11 | #include "sleep.h" | 13 | #include "sleep.h" |
12 | 14 | ||
13 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 15 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
@@ -136,13 +138,10 @@ void acpi_disable_wakeup_device(u8 sleep_state) | |||
136 | spin_unlock(&acpi_device_lock); | 138 | spin_unlock(&acpi_device_lock); |
137 | } | 139 | } |
138 | 140 | ||
139 | static int __init acpi_wakeup_device_init(void) | 141 | int __init acpi_wakeup_device_init(void) |
140 | { | 142 | { |
141 | struct list_head *node, *next; | 143 | struct list_head *node, *next; |
142 | 144 | ||
143 | if (acpi_disabled) | ||
144 | return 0; | ||
145 | |||
146 | spin_lock(&acpi_device_lock); | 145 | spin_lock(&acpi_device_lock); |
147 | list_for_each_safe(node, next, &acpi_wakeup_device_list) { | 146 | list_for_each_safe(node, next, &acpi_wakeup_device_list) { |
148 | struct acpi_device *dev = container_of(node, | 147 | struct acpi_device *dev = container_of(node, |
@@ -163,5 +162,3 @@ static int __init acpi_wakeup_device_init(void) | |||
163 | spin_unlock(&acpi_device_lock); | 162 | spin_unlock(&acpi_device_lock); |
164 | return 0; | 163 | return 0; |
165 | } | 164 | } |
166 | |||
167 | late_initcall(acpi_wakeup_device_init); | ||