--- ./linux-2.6.16.x86_64/drivers/xen/console/console.c.xencons	2006-06-28 13:11:58.000000000 +0100
+++ ./linux-2.6.16.x86_64/drivers/xen/console/console.c	2006-07-02 18:12:28.000000000 +0100
@@ -267,7 +267,7 @@
 /******************** User-space console driver (/dev/console) ************/
 
 #define DRV(_d)         (_d)
-#define TTY_INDEX(_tty) ((_tty)->index)
+#define DUMMY_TTY(_tty) (xc_mode != XC_SERIAL && (_tty)->index != (xc_num - 1))
 
 static struct termios *xencons_termios[MAX_NR_CONSOLES];
 static struct termios *xencons_termios_locked[MAX_NR_CONSOLES];
@@ -391,7 +391,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -402,7 +402,7 @@
 
 static void xencons_throttle(struct tty_struct *tty)
 {
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	if (I_IXOFF(tty))
@@ -411,7 +411,7 @@
 
 static void xencons_unthrottle(struct tty_struct *tty)
 {
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	if (I_IXOFF(tty)) {
@@ -426,7 +426,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -451,7 +451,7 @@
 	int i;
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return count;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -472,7 +472,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -484,7 +484,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -496,7 +496,7 @@
 {
 	unsigned long orig_jiffies = jiffies;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	while (DRV(tty->driver)->chars_in_buffer(tty)) {
@@ -515,7 +515,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return 0;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -532,7 +532,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (DUMMY_TTY(tty))
 		return;
 
 	if (tty->count == 1) {
@@ -588,8 +588,7 @@
 	DRV(xencons_driver)->init_termios    = tty_std_termios;
 	DRV(xencons_driver)->flags           =
 		TTY_DRIVER_REAL_RAW |
-		TTY_DRIVER_RESET_TERMIOS |
-		TTY_DRIVER_NO_DEVFS;
+		TTY_DRIVER_RESET_TERMIOS;
 	DRV(xencons_driver)->termios         = xencons_termios;
 	DRV(xencons_driver)->termios_locked  = xencons_termios_locked;
 
@@ -599,8 +598,8 @@
 		DRV(xencons_driver)->name_base   = 0 + xc_num;
 	} else {
 		DRV(xencons_driver)->name        = "tty";
-		DRV(xencons_driver)->minor_start = xc_num;
-		DRV(xencons_driver)->name_base   = xc_num;
+		DRV(xencons_driver)->minor_start = 1;
+		DRV(xencons_driver)->name_base   = 1;
 	}
 
 	tty_set_operations(xencons_driver, &xencons_ops);
@@ -615,8 +614,6 @@
 		return rc;
 	}
 
-	tty_register_device(xencons_driver, 0, NULL);
-
 	if (xen_start_info->flags & SIF_INITDOMAIN) {
 		xencons_priv_irq = bind_virq_to_irqhandler(
 			VIRQ_CONSOLE,
@@ -629,8 +626,7 @@
 	}
 
 	printk("Xen virtual console successfully installed as %s%d\n",
-	       DRV(xencons_driver)->name,
-	       DRV(xencons_driver)->name_base );
+	       DRV(xencons_driver)->name, xc_num);
 
 	return 0;
 }