Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[~andy/linux] / include / linux / console_struct.h

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index 25423f79bf9f95fbedc359de9aced4d4c99d1c23..ed6c0fee1ac76fa5af1e0ed27c26a6b6fbc86395 100644 (file)
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -54,7 +54,7 @@ struct vc_data {
        struct tty_struct *vc_tty;              /* TTY we are attached to */
        /* data for manual vt switching */
        struct vt_mode  vt_mode;
-       int             vt_pid;
+       struct pid      *vt_pid;
        int             vt_newvt;
        wait_queue_head_t paste_wait;
        /* mode flags */