--- ./drivers/xen/console/console.c.markmc	2006-06-28 13:11:58.000000000 +0100
+++ ./drivers/xen/console/console.c	2006-06-28 13:48:28.000000000 +0100
@@ -391,7 +391,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		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 (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	if (I_IXOFF(tty))
@@ -411,7 +411,7 @@
 
 static void xencons_unthrottle(struct tty_struct *tty)
 {
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	if (I_IXOFF(tty)) {
@@ -426,7 +426,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -451,7 +451,7 @@
 	int i;
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return count;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -472,7 +472,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -484,7 +484,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -496,7 +496,7 @@
 {
 	unsigned long orig_jiffies = jiffies;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	while (DRV(tty->driver)->chars_in_buffer(tty)) {
@@ -515,7 +515,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return 0;
 
 	spin_lock_irqsave(&xencons_lock, flags);
@@ -532,7 +532,7 @@
 {
 	unsigned long flags;
 
-	if (TTY_INDEX(tty) != 0)
+	if (TTY_INDEX(tty) != (xc_num - DRV(tty->driver)->minor_start))
 		return;
 
 	if (tty->count == 1) {
@@ -595,12 +595,12 @@
 
 	if (xc_mode == XC_SERIAL) {
 		DRV(xencons_driver)->name        = "ttyS";
-		DRV(xencons_driver)->minor_start = 64 + xc_num;
-		DRV(xencons_driver)->name_base   = 0 + xc_num;
+		DRV(xencons_driver)->minor_start = 64;
+		DRV(xencons_driver)->name_base   = 0;
 	} 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);