projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'procfs-cleanup' into release
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
acpi.h
diff --git
a/include/linux/acpi.h
b/include/linux/acpi.h
index 050a7bccb8365ef117f365ebe3d3a8d337efc390..fa7ed6a983d0b2bbd4367c053eb6b77b0deb5e22 100644
(file)
--- a/
include/linux/acpi.h
+++ b/
include/linux/acpi.h
@@
-219,7
+219,7
@@
static inline int acpi_video_display_switch_support(void)
extern int acpi_blacklisted(void);
extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
extern int acpi_blacklisted(void);
extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
-extern
int
acpi_osi_setup(char *str);
+extern
void
acpi_osi_setup(char *str);
#ifdef CONFIG_ACPI_NUMA
int acpi_get_pxm(acpi_handle handle);
#ifdef CONFIG_ACPI_NUMA
int acpi_get_pxm(acpi_handle handle);
@@
-254,6
+254,15
@@
void __init acpi_old_suspend_ordering(void);
void __init acpi_nvs_nosave(void);
#endif /* CONFIG_PM_SLEEP */
void __init acpi_nvs_nosave(void);
#endif /* CONFIG_PM_SLEEP */
+#ifdef CONFIG_ACPI_SLEEP
+int suspend_nvs_register(unsigned long start, unsigned long size);
+#else
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+ return 0;
+}
+#endif
+
struct acpi_osc_context {
char *uuid_str; /* uuid string */
int rev;
struct acpi_osc_context {
char *uuid_str; /* uuid string */
int rev;