aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/vt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r--drivers/char/vt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 13299b8fdbd6..d6694163b6f1 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -210,7 +210,7 @@ static int scrollback_delta;
210 */ 210 */
211int (*console_blank_hook)(int); 211int (*console_blank_hook)(int);
212 212
213static struct timer_list console_timer; 213static DEFINE_TIMER(console_timer, blank_screen_t, 0, 0);
214static int blank_state; 214static int blank_state;
215static int blank_timer_expired; 215static int blank_timer_expired;
216enum { 216enum {
@@ -2625,8 +2625,6 @@ static int __init con_init(void)
2625 for (i = 0; i < MAX_NR_CONSOLES; i++) 2625 for (i = 0; i < MAX_NR_CONSOLES; i++)
2626 con_driver_map[i] = conswitchp; 2626 con_driver_map[i] = conswitchp;
2627 2627
2628 init_timer(&console_timer);
2629 console_timer.function = blank_screen_t;
2630 if (blankinterval) { 2628 if (blankinterval) {
2631 blank_state = blank_normal_wait; 2629 blank_state = blank_normal_wait;
2632 mod_timer(&console_timer, jiffies + blankinterval); 2630 mod_timer(&console_timer, jiffies + blankinterval);