aboutsummaryrefslogtreecommitdiff
path: root/kernel/power/Makefile
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2009-06-10 01:28:19 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-06-12 21:32:33 +0200
commitfce2b111fae9151a53dabb36513b398d03337a19 (patch)
tree9349fce23fca0e2d90780e40aac2a6535f820c32 /kernel/power/Makefile
parent8b759b84c8b3c27ccc8dd787294636297b3ebb40 (diff)
PM/Hibernate: Move NVS routines into a seperate file (v2).
The *_nvs_* routines in swsusp.c make use of the io*map() functions, which are only provided for HAS_IOMEM, thus breaking compilation if HAS_IOMEM is not set. Fix this by moving the *_nvs_* routines into hibernate_nvs.c, which is only compiled if HAS_IOMEM is set. [rjw: Change the name of the new file to hibernate_nvs.c, add the license line to the header comment.] Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/Makefile')
-rw-r--r--kernel/power/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index eadb17fc8f5..c3b81c30e5d 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -9,5 +9,6 @@ obj-$(CONFIG_FREEZER) += process.o
obj-$(CONFIG_SUSPEND) += suspend.o
obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o
obj-$(CONFIG_HIBERNATION) += swsusp.o hibernate.o snapshot.o swap.o user.o
+obj-$(CONFIG_HIBERNATION_NVS) += hibernate_nvs.o
obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o