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/tsdev.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/tsdev.c')
-rw-r--r-- | drivers/input/tsdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c index 2d45e4df4163..0581edb9a560 100644 --- a/drivers/input/tsdev.c +++ b/drivers/input/tsdev.c | |||
@@ -409,9 +409,9 @@ static struct input_handle *tsdev_connect(struct input_handler *handler, | |||
409 | 409 | ||
410 | tsdev_table[minor] = tsdev; | 410 | tsdev_table[minor] = tsdev; |
411 | 411 | ||
412 | class_device_create(input_class, NULL, | 412 | class_device_create(&input_dev_class, &dev->cdev, |
413 | MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor), | 413 | MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor), |
414 | dev->dev, "ts%d", minor); | 414 | dev->cdev.dev, "ts%d", minor); |
415 | 415 | ||
416 | return &tsdev->handle; | 416 | return &tsdev->handle; |
417 | } | 417 | } |
@@ -421,7 +421,7 @@ static void tsdev_disconnect(struct input_handle *handle) | |||
421 | struct tsdev *tsdev = handle->private; | 421 | struct tsdev *tsdev = handle->private; |
422 | struct tsdev_list *list; | 422 | struct tsdev_list *list; |
423 | 423 | ||
424 | class_device_destroy(input_class, | 424 | class_device_destroy(&input_dev_class, |
425 | MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor)); | 425 | MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor)); |
426 | tsdev->exist = 0; | 426 | tsdev->exist = 0; |
427 | 427 | ||