tree 8f9453b2d07fe7e83a5d34ca076dbf424bcaf660
parent d35cb360c29956510b2fe1a953bd4968536f7216
author Alan Cox <alan@redhat.com> 1216721333 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> 1216757002 -0700

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>