nfsd: nfsd should drop CAP_MKNOD for non-root

[safe/jmp/linux-2.6] / include / linux / kbd_kern.h

diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index 4eb851e..8bdb16b 100644 (file)
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -75,7 +75,7 @@ extern int do_poke_blanked_console;
 
 extern void (*kbd_ledfunc)(unsigned int led);
 
-extern void set_console(int nr);
+extern int set_console(int nr);
 extern void schedule_console_callback(void);
 
 static inline void set_leds(void)
@@ -155,12 +155,13 @@ 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;
+       if (t->buf.tail != NULL)
                t->buf.tail->commit = t->buf.tail->used;
-       }
        spin_unlock_irqrestore(&t->buf.lock, flags);
-       schedule_work(&t->buf.work);
+       schedule_delayed_work(&t->buf.work, 0);
 }
 
+/* mac_hid.c */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
 #endif