[PATCH] tty: minor merge correction
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Tue, 27 Mar 2007 05:32:21 +0000 (21:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Mar 2007 16:05:15 +0000 (09:05 -0700)
commit62b3e920ed7612f318126f9c9b37c6a8dcd4199e
treea842834b8fb37d956dde48cb8461c2fd3b973fa4
parentd75e26a8298f84bca66374e98fa69049f26083ba
[PATCH] tty: minor merge correction

Its now used.. because we added the new definitions so enabled all the
goodies on i386

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-i386/termbits.h