diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
| commit | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b (patch) | |
| tree | f624579c4c27e1ffcba5e4141fcc0877c3a6ae56 /arch | |
| parent | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (diff) | |
| parent | 2a6b69765ad794389f2fc3e14a0afa1a995221c2 (diff) | |
| download | linux-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.tar.bz2 | |
Merge branch 'bugzilla-13931-sleep-nvs' into release
Conflicts:
drivers/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/e820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 7bca3c6a02fb..0d6fc71bedb1 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -729,7 +729,7 @@ static int __init e820_mark_nvs_memory(void) struct e820entry *ei = &e820.map[i]; if (ei->type == E820_NVS) - hibernate_nvs_register(ei->addr, ei->size); + suspend_nvs_register(ei->addr, ei->size); } return 0; |