git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
ub.c
diff --git
a/drivers/block/ub.c
b/drivers/block/ub.c
index b5690a045a01076c782a575b4e846af64d0306c5..9ae3bb713286f0d0d3a959a81f7f4b4db5cde1db 100644
(file)
--- a/
drivers/block/ub.c
+++ b/
drivers/block/ub.c
@@
-397,7
+397,7
@@
static int ub_probe_lun(struct ub_dev *sc, int lnum);
#else
static const struct usb_device_id ub_usb_ids[] = {
- { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US
_SC_SCSI, US
_PR_BULK) },
+ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US
B_SC_SCSI, USB
_PR_BULK) },
{ }
};