diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-27 22:25:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 09:52:54 -0700 |
| commit | 967ca692161d8c4e894932599592af8d62c0a895 (patch) | |
| tree | d1cb14bddd9484c0f9e58e9dd52881f172e235b9 /drivers/input/joydev.c | |
| parent | 23d50901617c2a8bdef509279a42d2e90f523db9 (diff) | |
| download | kernel_samsung_espresso10-967ca692161d8c4e894932599592af8d62c0a895.zip kernel_samsung_espresso10-967ca692161d8c4e894932599592af8d62c0a895.tar.gz kernel_samsung_espresso10-967ca692161d8c4e894932599592af8d62c0a895.tar.bz2 | |
[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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 40d2b46..9c17d1a 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 joydev_table[minor] = joydev; - class_device_create(input_class, NULL, + class_device_create(&input_dev_class, &dev->cdev, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor), - dev->dev, "js%d", minor); + dev->cdev.dev, "js%d", minor); return &joydev->handle; } @@ -525,7 +525,7 @@ static void joydev_disconnect(struct input_handle *handle) struct joydev *joydev = handle->private; struct joydev_list *list; - class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); + class_device_destroy(&input_dev_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); joydev->exist = 0; if (joydev->open) { |