diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /include/linux/usb.h | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 | ||