diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /include/linux/acpi.h | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0601075d09a1..a17177639376 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -235,6 +235,9 @@ int acpi_check_region(resource_size_t start, resource_size_t n, | |||
| 235 | int acpi_check_mem_region(resource_size_t start, resource_size_t n, | 235 | int acpi_check_mem_region(resource_size_t start, resource_size_t n, |
| 236 | const char *name); | 236 | const char *name); |
| 237 | 237 | ||
| 238 | #ifdef CONFIG_PM_SLEEP | ||
| 239 | void __init acpi_old_suspend_ordering(void); | ||
| 240 | #endif /* CONFIG_PM_SLEEP */ | ||
| 238 | #else /* CONFIG_ACPI */ | 241 | #else /* CONFIG_ACPI */ |
| 239 | 242 | ||
| 240 | static inline int early_acpi_boot_init(void) | 243 | static inline int early_acpi_boot_init(void) |