Merge http://linux-input.bkbits.net/linux-input

into heisenberg.transvirtual.com:/tmp/linux-input

drivers/char/pc_keyb.c

@@ -912,6 +912,8 @@ static char * __init initialize_kbd(void)
 
 void __init pckbd_init_hw(void)
 {
+#ifndef CONFIG_SERIO_I8042
+
 	kbd_request_region();
 
 	/* Flush any pending input. */
@@ -935,6 +937,7 @@ void __init pckbd_init_hw(void)
 
 	/* Ok, finally allocate the IRQ, and off we go.. */
 	kbd_request_irq(keyboard_interrupt);
+#endif
 }
 
 #if defined CONFIG_PSMOUSE
@@ -1213,6 +1216,7 @@ static struct miscdevice psaux_mouse = {
 
 static int __init psaux_init(void)
 {
+#ifndef CONFIG_SERIO_I8042
 	int retval;
 
 	if (!detect_auxiliary_port())
@@ -1241,6 +1245,7 @@ static int __init psaux_init(void)
 #endif /* INITIALIZE_MOUSE */
 	kbd_write_command(KBD_CCMD_MOUSE_DISABLE); /* Disable aux device. */
 	kbd_write_cmd(AUX_INTS_OFF); /* Disable controller ints. */
+#endif
 
 	return 0;
 }

drivers/input/evbug.c

@@ -37,6 +37,8 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Input driver event debug module"); 
 MODULE_LICENSE("GPL");
 
+static char evbug_name[] = "evbug";
+
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
 	printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", handle->dev->phys, type, code, value);
@@ -52,6 +54,7 @@ static struct input_handle *evbug_connect(struct input_handler *handler, struct
 
 	handle->dev = dev;
 	handle->handler = handler;
+	handle->name = evbug_name;
 
 	input_open_device(handle);
 

drivers/input/serio/serio.c

@@ -82,6 +82,7 @@ void serio_handle_events(void)
 		}
 
 		serio->event = 0;
+		serio = serio->next;
 	}
 }
 
@@ -95,7 +96,7 @@ static int serio_thread(void *nothing)
 		serio_handle_events();
 		if (current->flags & PF_FREEZE)
 			refrigerator(PF_IOTHREAD);
-		wait_event_interruptible(serio_wait, 1); 
+		interruptible_sleep_on(&serio_wait); 
 	} while (!signal_pending(current));
 
 	printk(KERN_DEBUG "serio: kseriod exiting");