This resolves some tty driver merge issues.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>