diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
| commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
| tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /drivers/char/vt.c | |
| parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
| parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index d7aa7a29f67e..30d96739fb23 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2796,7 +2796,7 @@ void do_blank_screen(int entering_gfx) return; if (vesa_off_interval) { - blank_state = blank_vesa_wait, + blank_state = blank_vesa_wait; mod_timer(&console_timer, jiffies + vesa_off_interval); } |