PM / VT: Cleanup #if defined uglyness and fix compile error
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 21 Sep 2011 20:47:55 +0000 (22:47 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Oct 2011 21:28:51 +0000 (23:28 +0200)
commit37cce26b32142f09a8967f6d238178af654b20de
treee1184828f0a9e7dfd0609793fa5ec0638731ca4b
parent528f7ce6e439edeac38f6b3f8561f1be129b5e91
PM / VT: Cleanup #if defined uglyness and fix compile error

Introduce the config option CONFIG_VT_CONSOLE_SLEEP in order to cleanup
the #if defined ugliness for the vt suspend support functions. Note that
CONFIG_VT_CONSOLE is already dependant on CONFIG_VT.

The function pm_set_vt_switch is actually dependant on CONFIG_VT and not
CONFIG_PM_SLEEP. This fixes a compile error when CONFIG_PM_SLEEP is
not set:

drivers/tty/vt/vt_ioctl.c:1794: error: redefinition of 'pm_set_vt_switch'
include/linux/suspend.h:17: error: previous definition of 'pm_set_vt_switch' was here

Also, remove the incorrect path from the comment in console.c.

[rjw: Replaced #if defined() with #ifdef in suspend.h.]

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/tty/Kconfig
include/linux/suspend.h
kernel/power/Makefile
kernel/power/console.c