diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/usb/storage/unusual_devs.h | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 9b656ec427d0..22ab2380367d 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -407,7 +407,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, | |||
| 407 | "FinePix 1400Zoom", | 407 | "FinePix 1400Zoom", |
| 408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), | 408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), |
| 409 | 409 | ||
| 410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> | 410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> |
| 411 | * The device needs the flags only. | 411 | * The device needs the flags only. |
| 412 | */ | 412 | */ |
| 413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, | 413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, |
| @@ -1551,7 +1551,7 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, | |||
| 1551 | US_FL_GO_SLOW ), | 1551 | US_FL_GO_SLOW ), |
| 1552 | 1552 | ||
| 1553 | /* | 1553 | /* |
| 1554 | * David Härdeman <david@2gen.com> | 1554 | * David Härdeman <david@2gen.com> |
| 1555 | * The key makes the SCSI stack print confusing (but harmless) messages | 1555 | * The key makes the SCSI stack print confusing (but harmless) messages |
| 1556 | */ | 1556 | */ |
| 1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, | 1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, |