Merge branch 'pm-assorted' into linux-next

* pm-assorted:
  PM / VT: Cleanup #if defined uglyness and fix compile error

Conflicts:
	kernel/power/Makefile

diff --cc kernel/power/Makefile
index ad6bdd8b401aea9c189e7c2447937fcd8e674270,b87c77c10abd134dbceeb467002ade8fb65fde0a..07e0e28ffba7644b8b97e037d05b9d9aa8e5df46
--- 1/kernel/power/Makefile
--- 2/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  
  ccflags-$(CONFIG_PM_DEBUG)    := -DDEBUG
  
 -obj-$(CONFIG_PM)              += main.o
 +obj-$(CONFIG_PM)              += main.o qos.o
- obj-$(CONFIG_PM_SLEEP)                += console.o
+ obj-$(CONFIG_VT_CONSOLE_SLEEP)        += console.o
  obj-$(CONFIG_FREEZER)         += process.o
  obj-$(CONFIG_SUSPEND)         += suspend.o
  obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o