diff -urN -X ../dontdiff linux-2.6.11-rc4-bk8/drivers/serial/21285.c linux-2.6.11-rc4-bk8-test1/drivers/serial/21285.c
--- linux-2.6.11-rc4-bk8/drivers/serial/21285.c	2005-01-04 10:57:57.000000000 +0000
+++ linux-2.6.11-rc4-bk8-test1/drivers/serial/21285.c	2005-02-21 12:34:22.000000000 +0000
@@ -142,7 +142,6 @@
 	}
 	tty_flip_buffer_push(tty);
 
- out:
 	return IRQ_HANDLED;
 }
 
@@ -383,11 +382,9 @@
 };
 
 static struct uart_port serial21285_port = {
-	.membase	= 0,
 	.mapbase	= 0x42000160,
 	.iotype		= SERIAL_IO_MEM,
 	.irq		= NO_IRQ,
-	.uartclk	= 0,
 	.fifosize	= 16,
 	.ops		= &serial21285_ops,
 	.flags		= ASYNC_BOOT_AUTOCONF,