Merge master.kernel.org:/home/rmk/linux-2.6-serial

2005-06-27 15:04:08 -07:00
parent 8b789b7d7e ec9f47cd6a
commit d498a2c765
10 changed files with 357 additions and 49 deletions
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@ -22,6 +22,7 @@ struct plat_serial8250_port {
 	unsigned int	uartclk;	/* UART clock rate */
 	unsigned char	regshift;	/* register shift */
 	unsigned char	iotype;		/* UPIO_* */
+	unsigned char	hub6;
 	unsigned int	flags;		/* UPF_* flags */
 };