diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /drivers/usb/storage/unusual_devs.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 9fcc7bd1fbe4..bd0ab3039bdd 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -697,7 +697,7 @@ UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133, | |||
| 697 | UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100, | 697 | UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100, |
| 698 | "Microtech", | 698 | "Microtech", |
| 699 | "USB-SCSI-HD50", | 699 | "USB-SCSI-HD50", |
| 700 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, | 700 | US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, |
| 701 | US_FL_SCM_MULT_TARG ), | 701 | US_FL_SCM_MULT_TARG ), |
| 702 | 702 | ||
| 703 | #ifdef CONFIG_USB_STORAGE_DPCM | 703 | #ifdef CONFIG_USB_STORAGE_DPCM |