diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /include/linux/usb.h | |
| parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
| parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 130d125fda12..e34e5e3dce52 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -615,7 +615,7 @@ extern struct bus_type usb_bus_type; | |||
| 615 | */ | 615 | */ |
| 616 | struct usb_class_driver { | 616 | struct usb_class_driver { |
| 617 | char *name; | 617 | char *name; |
| 618 | struct file_operations *fops; | 618 | const struct file_operations *fops; |
| 619 | int minor_base; | 619 | int minor_base; |
| 620 | }; | 620 | }; |
| 621 | 621 | ||