aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-07-24 23:26:22 -0400
committerLen Brown <len.brown@intel.com>2010-07-24 23:26:22 -0400
commit0e1cf38889110a7188999388614aef17a84d9d25 (patch)
tree828ba587fc124a2c28cb52d2b6a8ea07e4b57079 /include
parentbbac30edb39a80426e4a3420a5ec635eb4466f63 (diff)
parent72ad5d77fb981963edae15eee8196c80238f5ed0 (diff)
Merge branch 'bugzilla-16396' into release
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 224a38c960d4..ccf94dc5acdf 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -253,7 +253,7 @@ int acpi_resources_are_enforced(void);
253#ifdef CONFIG_PM_SLEEP 253#ifdef CONFIG_PM_SLEEP
254void __init acpi_no_s4_hw_signature(void); 254void __init acpi_no_s4_hw_signature(void);
255void __init acpi_old_suspend_ordering(void); 255void __init acpi_old_suspend_ordering(void);
256void __init acpi_s4_no_nvs(void); 256void __init acpi_nvs_nosave(void);
257#endif /* CONFIG_PM_SLEEP */ 257#endif /* CONFIG_PM_SLEEP */
258 258
259struct acpi_osc_context { 259struct acpi_osc_context {