]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ttydev: Fix up compile failures in the PPC build
authorAlan Cox <alan@redhat.com>
Tue, 22 Jul 2008 10:08:53 +0000 (11:08 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2008 20:03:22 +0000 (13:03 -0700)
commit1aa3692da57c773e5c76de55c5c4a953962d360e
tree8f9453b2d07fe7e83a5d34ca076dbf424bcaf660
parentd35cb360c29956510b2fe1a953bd4968536f7216
ttydev: Fix up compile failures in the PPC build

Fix up a couple of reported merge problems

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/icom.c
drivers/serial/serial_txx9.c