Merge commit 'kumar/merge' into merge

[~andy/linux] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 2c60f1f70b38a4860a60e76348836f7661fa756e..224a38c960d4c01830eb96987325d88aee33a2bf 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -254,7 +254,6 @@ int acpi_resources_are_enforced(void);
 void __init acpi_no_s4_hw_signature(void);
 void __init acpi_old_suspend_ordering(void);
 void __init acpi_s4_no_nvs(void);
-void __init acpi_set_sci_en_on_resume(void);
 #endif /* CONFIG_PM_SLEEP */
 
 struct acpi_osc_context {