summaryrefslogtreecommitdiffstats
path: root/arch/mn10300/kernel/mn10300-serial.c
diff options
context:
space:
mode:
authorIngo Molnar2008-07-22 09:06:21 +0200
committerIngo Molnar2008-07-22 09:06:21 +0200
commit76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch)
tree3824e008db9d554229a70c85fbbc13238276bd7a /arch/mn10300/kernel/mn10300-serial.c
parentx86, lguest: fix apic_ops build on UP (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
downloadkernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz
kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.xz
kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial.c')
-rw-r--r--arch/mn10300/kernel/mn10300-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index b9c268c6b2fb..8b054e7a8ae8 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -392,7 +392,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
{
struct uart_icount *icount = &port->uart.icount;
- struct tty_struct *tty = port->uart.info->tty;
+ struct tty_struct *tty = port->uart.info->port.tty;
unsigned ix;
int count;
u8 st, ch, push, status, overrun;