PM: merge device power-management source files
commitcd59abfcc441b2abb4cf2cd62c1eb0f02a60e8dd
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 21 Sep 2007 19:36:56 +0000 (21 15:36 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 12 Oct 2007 21:51:12 +0000 (12 14:51 -0700)
tree35b31fd683115cc7bc7dfcb2a7867469193cb17b
parent6d66f5cd26e4c482e986130b7572f2735a0f7e8b
PM: merge device power-management source files

This patch (as993) merges the suspend.c and resume.c files in
drivers/base/power into main.c, making some public symbols private.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/base/power/Makefile
drivers/base/power/main.c [moved from drivers/base/power/suspend.c with 55% similarity]
drivers/base/power/power.h
drivers/base/power/resume.c [deleted file]