diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/linux/usb.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
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 | ||