diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2011-09-21 16:47:55 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-16 17:28:51 -0400 |
| commit | 37cce26b32142f09a8967f6d238178af654b20de (patch) | |
| tree | e1184828f0a9e7dfd0609793fa5ec0638731ca4b /drivers | |
| parent | 528f7ce6e439edeac38f6b3f8561f1be129b5e91 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index bd7cc0527999..a7188a0b68eb 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig | |||
| @@ -60,6 +60,10 @@ config VT_CONSOLE | |||
| 60 | 60 | ||
| 61 | If unsure, say Y. | 61 | If unsure, say Y. |
| 62 | 62 | ||
| 63 | config VT_CONSOLE_SLEEP | ||
| 64 | def_bool y | ||
| 65 | depends on VT_CONSOLE && PM_SLEEP | ||
| 66 | |||
| 63 | config HW_CONSOLE | 67 | config HW_CONSOLE |
| 64 | bool | 68 | bool |
| 65 | depends on VT && !S390 && !UML | 69 | depends on VT && !S390 && !UML |