Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6-omap-h63xx.git] / include / linux / kbd_kern.h

diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index 3aed37314ab805de8fe3dcfec0a5282d7035cc54..efe0ee4cc80baee508567f08c72b3f7d03277e43 100644 (file)
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -135,6 +135,8 @@ static inline void chg_vc_kbd_led(struct kbd_struct * kbd, int flag)
 
 #define U(x) ((x) ^ 0xf000)
 
+#define BRL_UC_ROW 0x2800
+
 /* keyboard.c */
 
 struct console;
@@ -154,7 +156,7 @@ static inline void con_schedule_flip(struct tty_struct *t)
        unsigned long flags;
        spin_lock_irqsave(&t->buf.lock, flags);
        if (t->buf.tail != NULL)
-               t->buf.tail->active = 0;
+               t->buf.tail->commit = t->buf.tail->used;
        spin_unlock_irqrestore(&t->buf.lock, flags);
        schedule_work(&t->buf.work);
 }