diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 01:25:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 12:52:54 -0400 |
commit | 967ca692161d8c4e894932599592af8d62c0a895 (patch) | |
tree | d1cb14bddd9484c0f9e58e9dd52881f172e235b9 /drivers/input/evdev.c | |
parent | 23d50901617c2a8bdef509279a42d2e90f523db9 (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/evdev.c')
-rw-r--r-- | drivers/input/evdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 14ea57f963bb..579041ded4be 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -686,9 +686,9 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct | |||
686 | 686 | ||
687 | evdev_table[minor] = evdev; | 687 | evdev_table[minor] = evdev; |
688 | 688 | ||
689 | class_device_create(input_class, NULL, | 689 | class_device_create(&input_dev_class, &dev->cdev, |
690 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), | 690 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), |
691 | dev->dev, "event%d", minor); | 691 | dev->cdev.dev, "event%d", minor); |
692 | 692 | ||
693 | return &evdev->handle; | 693 | return &evdev->handle; |
694 | } | 694 | } |
@@ -698,7 +698,7 @@ static void evdev_disconnect(struct input_handle *handle) | |||
698 | struct evdev *evdev = handle->private; | 698 | struct evdev *evdev = handle->private; |
699 | struct evdev_list *list; | 699 | struct evdev_list *list; |
700 | 700 | ||
701 | class_device_destroy(input_class, | 701 | class_device_destroy(&input_dev_class, |
702 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); | 702 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); |
703 | evdev->exist = 0; | 703 | evdev->exist = 0; |
704 | 704 | ||