diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/input/hiddev.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/input/hiddev.c')
| -rw-r--r-- | drivers/usb/input/hiddev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index d32427818af7..440377c7a0da 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -732,9 +732,8 @@ static struct file_operations hiddev_fops = { | |||
| 732 | }; | 732 | }; |
| 733 | 733 | ||
| 734 | static struct usb_class_driver hiddev_class = { | 734 | static struct usb_class_driver hiddev_class = { |
| 735 | .name = "usb/hid/hiddev%d", | 735 | .name = "hiddev%d", |
| 736 | .fops = &hiddev_fops, | 736 | .fops = &hiddev_fops, |
| 737 | .mode = S_IFCHR | S_IRUGO | S_IWUSR, | ||
| 738 | .minor_base = HIDDEV_MINOR_BASE, | 737 | .minor_base = HIDDEV_MINOR_BASE, |
| 739 | }; | 738 | }; |
| 740 | 739 | ||