diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /include/linux/console_struct.h | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 25423f79bf9f..ed6c0fee1ac7 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h | |||
| @@ -54,7 +54,7 @@ struct vc_data { | |||
| 54 | struct tty_struct *vc_tty; /* TTY we are attached to */ | 54 | struct tty_struct *vc_tty; /* TTY we are attached to */ |
| 55 | /* data for manual vt switching */ | 55 | /* data for manual vt switching */ |
| 56 | struct vt_mode vt_mode; | 56 | struct vt_mode vt_mode; |
| 57 | int vt_pid; | 57 | struct pid *vt_pid; |
| 58 | int vt_newvt; | 58 | int vt_newvt; |
| 59 | wait_queue_head_t paste_wait; | 59 | wait_queue_head_t paste_wait; |
| 60 | /* mode flags */ | 60 | /* mode flags */ |