ia64/xen-unstable

changeset 3916:ade108bf0e19

bitkeeper revision 1.1236.1.15 (421db61bgONipq0c7bjsEyIfuoZzEw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Feb 24 11:10:19 2005 +0000 (2005-02-24)
parents 9a7751095472 6a87842aa546
children 86b610094dd0
files linux-2.6.10-xen-sparse/drivers/char/tty_io.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/char/tty_io.c	Thu Feb 24 10:46:37 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/char/tty_io.c	Thu Feb 24 11:10:19 2005 +0000
     1.3 @@ -1772,7 +1772,7 @@ retry_open:
     1.4  		goto got_driver;
     1.5  	}
     1.6  #ifdef CONFIG_VT
     1.7 -	if (device == MKDEV(TTY_MAJOR,0)) {
     1.8 +	if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) {
     1.9  		extern int fg_console;
    1.10  		extern struct tty_driver *console_driver;
    1.11  		driver = console_driver;