X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Flinux%2Fkbd_kern.h;h=8bdb16bfe5fb698eb2d8e0a0fe8c6785434e53d0;hb=76a67ec6fb79ff3570dcb5342142c16098299911;hp=4eb851ece080d0682f4ada0b9fe24aad22c3cd19;hpb=b9ec4e109d7a342e83e1210e05797222e36555c3;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index 4eb851e..8bdb16b 100644
--- 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