diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/usb/media/dabusb.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/media/dabusb.c')
| -rw-r--r-- | drivers/usb/media/dabusb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c index 6ca2fae99d2d..27b23c55bbc7 100644 --- a/drivers/usb/media/dabusb.c +++ b/drivers/usb/media/dabusb.c | |||
| @@ -707,9 +707,8 @@ static struct file_operations dabusb_fops = | |||
| 707 | }; | 707 | }; |
| 708 | 708 | ||
| 709 | static struct usb_class_driver dabusb_class = { | 709 | static struct usb_class_driver dabusb_class = { |
| 710 | .name = "usb/dabusb%d", | 710 | .name = "dabusb%d", |
| 711 | .fops = &dabusb_fops, | 711 | .fops = &dabusb_fops, |
| 712 | .mode = S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, | ||
| 713 | .minor_base = DABUSB_MINOR, | 712 | .minor_base = DABUSB_MINOR, |
| 714 | }; | 713 | }; |
| 715 | 714 | ||