input: Manual merge.

diff --cc drivers/char/keyboard.c
Simple merge

diff --cc drivers/input/joydev.c
index 26f601905ebb0888dc3406768ea091f13c0aa2b4,1ca52c925e164403cacf89adf43c8c3f69790f89..abc2e107ee74381e40b000664d36fb59fb51a564
--- 1/drivers/input/joydev.c
--- 2/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@@ -143,9 -143,8 +143,9 @@@ static int joydev_fasync(int fd, struc
  
  static void joydev_free(struct joydev *joydev)
  {
-       devfs_remove("js%d", joydev->minor);
+       devfs_remove("input/js%d", joydev->minor);
        joydev_table[joydev->minor] = NULL;
 +      class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
        kfree(joydev);
  }
  
@@@ -444,10 -450,7 +451,10 @@@ static struct input_handle *joydev_conn
        joydev_table[minor] = joydev;
        
        devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
-                       S_IFCHR|S_IRUGO|S_IWUSR, "js%d", minor);
+                       S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor);
 +      class_simple_device_add(input_class, 
 +                              MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
 +                              dev->dev, "js%d", minor);
  
        return &joydev->handle;
  }

diff --cc drivers/input/keyboard/atkbd.c
index a53159156d7926c219892390036584b2be657621,a0f9fc24b54574a96112f25c620ab22514c785f5..3c9106d8706536e5bc373ab21161be06c58011ab
--- 1/drivers/input/keyboard/atkbd.c
--- 2/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@@ -36,9 -35,7 +36,9 @@@ MODULE_PARM(atkbd_softrepeat, "1i")
  MODULE_LICENSE("GPL");
  
  static int atkbd_set = 2;
- #if defined(__i386__) || defined (__x86_64__)
 +module_param_named(set, atkbd_set, int, 0);
 +MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3, 4)");
+ #if defined(__i386__) || defined(__x86_64__) || defined(__hppa__)
  static int atkbd_reset;
  #else
  static int atkbd_reset = 1;

diff --cc drivers/input/keyboard/maple_keyb.c
Simple merge

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc drivers/input/serio/i8042.c
Simple merge

diff --cc include/linux/input.h
Simple merge