From a038b08b8637f94d589430f9b27ad5f2ccf4bed8 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 7 Jan 2011 01:44:28 +0100
Subject: [PATCH] --- yaml --- r: 230913 b: refs/heads/master c:
 d146df18c13d16e321efa8ef9b57c95c3bec1722 h: refs/heads/master i:   230911:
 a954a1a4da24511f074efa4beef4fd8f4d5f29f3 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/acpi/nvs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index efc5ebff2584..77baf6310af8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976513dbfc1547c7b1822566923058655f0c32fd
+refs/heads/master: d146df18c13d16e321efa8ef9b57c95c3bec1722
diff --git a/trunk/drivers/acpi/nvs.c b/trunk/drivers/acpi/nvs.c
index 57c6fabbb6b6..7d648092427e 100644
--- a/trunk/drivers/acpi/nvs.c
+++ b/trunk/drivers/acpi/nvs.c
@@ -1,7 +1,7 @@
 /*
- * linux/kernel/power/hibernate_nvs.c - Routines for handling NVS memory
+ * nvs.c - Routines for saving and restoring ACPI NVS memory region
  *
- * Copyright (C) 2008,2009 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
+ * Copyright (C) 2008-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
  *
  * This file is released under the GPLv2.
  */
@@ -11,7 +11,7 @@
 #include <linux/list.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/suspend.h>
+#include <linux/acpi.h>
 
 /*
  * Platforms, like ACPI, may want us to save some memory used by them during