]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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>
Wed, 21 Sep 2011 20:47:55 +0000 (22:47 +0200)
commit054c26d578ee382d0325b7a9d661725cc7fa5448
treedcbb222786b393a2b160ca3b0b31a23a1439eab6
parent9d5515bbcf8c136eedd5862105a9f0b248c34f18
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