diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 17:49:49 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 17:49:49 -0500 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /drivers/usb/storage/libusual.c | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/storage/libusual.c')
| -rw-r--r-- | drivers/usb/storage/libusual.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/libusual.c b/drivers/usb/storage/libusual.c index b28151d1b609..b1ec4a718547 100644 --- a/drivers/usb/storage/libusual.c +++ b/drivers/usb/storage/libusual.c | |||
| @@ -116,7 +116,7 @@ EXPORT_SYMBOL_GPL(usb_usual_check_type); | |||
| 116 | static int usu_probe(struct usb_interface *intf, | 116 | static int usu_probe(struct usb_interface *intf, |
| 117 | const struct usb_device_id *id) | 117 | const struct usb_device_id *id) |
| 118 | { | 118 | { |
| 119 | int type; | 119 | unsigned long type; |
| 120 | int rc; | 120 | int rc; |
| 121 | unsigned long flags; | 121 | unsigned long flags; |
| 122 | 122 | ||