diff options
author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-11-17 01:46:12 +0000 |
---|---|---|
committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-11-17 01:46:12 +0000 |
commit | 187923c5b8ff0b5e59672a4efe12ec1afa608ca8 (patch) | |
tree | 68896b81610a2a4e1b36beb668e864874cacf141 | |
parent | e228c332061fd250ba7d41f40864c76fb401f8e1 (diff) | |
parent | 3689020ade1cb195eb1f7d34f52da855f4920b15 (diff) | |
download | xen-187923c5b8ff0b5e59672a4efe12ec1afa608ca8.tar.gz xen-187923c5b8ff0b5e59672a4efe12ec1afa608ca8.tar.bz2 xen-187923c5b8ff0b5e59672a4efe12ec1afa608ca8.zip |
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
-rw-r--r-- | linux-2.6.9-xen-sparse/drivers/char/tty_io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c index c524a5c13a..32e28717f8 100644 --- a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c +++ b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c @@ -131,9 +131,8 @@ LIST_HEAD(tty_drivers); /* linked list of tty drivers */ vt.c for deeply disgusting hack reasons */ DECLARE_MUTEX(tty_sem); -#ifdef CONFIG_VT int console_use_vt = 1; -#endif + #ifdef CONFIG_UNIX98_PTYS extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ extern int pty_limit; /* Config limit on Unix98 ptys */ |