Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-07-26 03:14:19 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-07-26 03:14:19 -0700
commite9cdd788140681db68b1c541b857dd60a08ee03d (patch)
tree5ed1d5ac609c270834c3d1072dd16748fdaba5a4
parent7eec50e396520d000fc41c89f23a9415649001da (diff)
parentc75efab2e7bff509b22cfce9ccbbca33aee375f6 (diff)
Merge bk://bk.arm.linux.org.uk:14691
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--drivers/serial/8250.c1
-rw-r--r--drivers/serial/8250.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 141aa7c49718..8a3f86d45abc 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1707,6 +1707,7 @@ static void __init serial8250_isa_init_ports(void)
serial8250_ports[i].port.irq = irq_cannonicalize(old_serial_port[i].irq);
serial8250_ports[i].port.uartclk = old_serial_port[i].base_baud * 16;
serial8250_ports[i].port.flags = old_serial_port[i].flags;
+ serial8250_ports[i].port.hub6 = old_serial_port[i].hub6;
serial8250_ports[i].port.ops = &serial8250_pops;
}
}
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index e0935d1a2447..7e40a4f497e4 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -34,6 +34,7 @@ struct old_serial_port {
unsigned int port;
unsigned int irq;
unsigned int flags;
+ unsigned char hub6;
};
#undef SERIAL_DEBUG_PCI