diff options
author | Eric Anholt | 2010-08-02 04:23:53 +0200 |
---|---|---|
committer | Eric Anholt | 2010-08-02 04:34:47 +0200 |
commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /include/linux/acpi.h | |
parent | agp/intel: Add actual definitions of the Sandybridge PTE caching bits. (diff) | |
parent | Linux 2.6.35 (diff) | |
download | kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.gz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.xz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.zip |
Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 2 |
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); #ifdef CONFIG_PM_SLEEP 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_nvs_nosave(void); #endif /* CONFIG_PM_SLEEP */ struct acpi_osc_context { |