PM/Hibernate: Move NVS routines into a seperate file (v2).
authorCornelia Huck <cornelia.huck@de.ibm.com>
Tue, 9 Jun 2009 23:28:19 +0000 (01:28 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 12 Jun 2009 19:32:33 +0000 (21:32 +0200)
commitfce2b111fae9151a53dabb36513b398d03337a19
tree9349fce23fca0e2d90780e40aac2a6535f820c32
parent8b759b84c8b3c27ccc8dd787294636297b3ebb40
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>
include/linux/suspend.h
kernel/power/Kconfig
kernel/power/Makefile
kernel/power/hibernate_nvs.c [new file with mode: 0644]
kernel/power/swsusp.c