diff options
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fa7ed6a983d0..eb176bb1b15b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -254,15 +254,6 @@ void __init acpi_old_suspend_ordering(void); | |||
254 | void __init acpi_nvs_nosave(void); | 254 | void __init acpi_nvs_nosave(void); |
255 | #endif /* CONFIG_PM_SLEEP */ | 255 | #endif /* CONFIG_PM_SLEEP */ |
256 | 256 | ||
257 | #ifdef CONFIG_ACPI_SLEEP | ||
258 | int suspend_nvs_register(unsigned long start, unsigned long size); | ||
259 | #else | ||
260 | static inline int suspend_nvs_register(unsigned long a, unsigned long b) | ||
261 | { | ||
262 | return 0; | ||
263 | } | ||
264 | #endif | ||
265 | |||
266 | struct acpi_osc_context { | 257 | struct acpi_osc_context { |
267 | char *uuid_str; /* uuid string */ | 258 | char *uuid_str; /* uuid string */ |
268 | int rev; | 259 | int rev; |
@@ -361,4 +352,14 @@ static inline int acpi_table_parse(char *id, | |||
361 | return -1; | 352 | return -1; |
362 | } | 353 | } |
363 | #endif /* !CONFIG_ACPI */ | 354 | #endif /* !CONFIG_ACPI */ |
355 | |||
356 | #ifdef CONFIG_ACPI_SLEEP | ||
357 | int suspend_nvs_register(unsigned long start, unsigned long size); | ||
358 | #else | ||
359 | static inline int suspend_nvs_register(unsigned long a, unsigned long b) | ||
360 | { | ||
361 | return 0; | ||
362 | } | ||
363 | #endif | ||
364 | |||
364 | #endif /*_LINUX_ACPI_H*/ | 365 | #endif /*_LINUX_ACPI_H*/ |