aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 01:25:43 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 12:52:54 -0400
commit967ca692161d8c4e894932599592af8d62c0a895 (patch)
treed1cb14bddd9484c0f9e58e9dd52881f172e235b9 /drivers/input/joydev.c
parent23d50901617c2a8bdef509279a42d2e90f523db9 (diff)
[PATCH] INPUT: move the input class devices under their new input_dev devices
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 40d2b46cbc79..9c17d1add260 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -513,9 +513,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
513 513
514 joydev_table[minor] = joydev; 514 joydev_table[minor] = joydev;
515 515
516 class_device_create(input_class, NULL, 516 class_device_create(&input_dev_class, &dev->cdev,
517 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor), 517 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
518 dev->dev, "js%d", minor); 518 dev->cdev.dev, "js%d", minor);
519 519
520 return &joydev->handle; 520 return &joydev->handle;
521} 521}
@@ -525,7 +525,7 @@ static void joydev_disconnect(struct input_handle *handle)
525 struct joydev *joydev = handle->private; 525 struct joydev *joydev = handle->private;
526 struct joydev_list *list; 526 struct joydev_list *list;
527 527
528 class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); 528 class_device_destroy(&input_dev_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
529 joydev->exist = 0; 529 joydev->exist = 0;
530 530
531 if (joydev->open) { 531 if (joydev->open) {