ia64/xen-unstable

changeset 3007:c7639d2f3d9d

bitkeeper revision 1.1159.170.34 (419aad6416AhQtqf_9z4O_V7Cit8iQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Nov 17 01:46:12 2004 +0000 (2004-11-17)
parents d3865a06ff71 19709f876d45
children a38b578f1146
files linux-2.6.9-xen-sparse/drivers/char/tty_io.c
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Wed Nov 17 00:33:38 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Wed Nov 17 01:46:12 2004 +0000
     1.3 @@ -131,9 +131,8 @@ LIST_HEAD(tty_drivers);			/* linked list
     1.4     vt.c for deeply disgusting hack reasons */
     1.5  DECLARE_MUTEX(tty_sem);
     1.6  
     1.7 -#ifdef CONFIG_VT
     1.8  int console_use_vt = 1;
     1.9 -#endif
    1.10 +
    1.11  #ifdef CONFIG_UNIX98_PTYS
    1.12  extern struct tty_driver *ptm_driver;	/* Unix98 pty masters; for /dev/ptmx */
    1.13  extern int pty_limit;		/* Config limit on Unix98 ptys */