diff options
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 41f7ce7edd7..a1717763937 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -82,6 +82,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size); | |||
| 82 | int early_acpi_boot_init(void); | 82 | int early_acpi_boot_init(void); |
| 83 | int acpi_boot_init (void); | 83 | int acpi_boot_init (void); |
| 84 | int acpi_boot_table_init (void); | 84 | int acpi_boot_table_init (void); |
| 85 | int acpi_mps_check (void); | ||
| 85 | int acpi_numa_init (void); | 86 | int acpi_numa_init (void); |
| 86 | 87 | ||
| 87 | int acpi_table_init (void); | 88 | int acpi_table_init (void); |
| @@ -234,6 +235,9 @@ int acpi_check_region(resource_size_t start, resource_size_t n, | |||
| 234 | 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, |
| 235 | const char *name); | 236 | const char *name); |
| 236 | 237 | ||
| 238 | #ifdef CONFIG_PM_SLEEP | ||
| 239 | void __init acpi_old_suspend_ordering(void); | ||
| 240 | #endif /* CONFIG_PM_SLEEP */ | ||
| 237 | #else /* CONFIG_ACPI */ | 241 | #else /* CONFIG_ACPI */ |
| 238 | 242 | ||
| 239 | static inline int early_acpi_boot_init(void) | 243 | static inline int early_acpi_boot_init(void) |
| @@ -250,6 +254,11 @@ static inline int acpi_boot_table_init(void) | |||
| 250 | return 0; | 254 | return 0; |
| 251 | } | 255 | } |
| 252 | 256 | ||
| 257 | static inline int acpi_mps_check(void) | ||
| 258 | { | ||
| 259 | return 0; | ||
| 260 | } | ||
| 261 | |||
| 253 | static inline int acpi_check_resource_conflict(struct resource *res) | 262 | static inline int acpi_check_resource_conflict(struct resource *res) |
| 254 | { | 263 | { |
| 255 | return 0; | 264 | return 0; |
