diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 14:02:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 14:02:10 -0800 |
commit | ec72070b1201203387e0c32a23ed17e35a24b170 (patch) | |
tree | f28d715cb39c145267f0e7c0dd376ee27873f263 /drivers/usb/storage/unusual_devs.h | |
parent | 436002e3293472e4a7e47e5025999fc312794c4a (diff) | |
parent | 34d1a8aa882df916e1b078dc935e3d2d3792aea2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index e71c5ca1a07..31ca92056c2 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -753,6 +753,13 @@ UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, "Flashgate", US_SC_SCSI, US_PR_BULK, NULL, 0 ), +/* Reported by David Hamilton <niftimusmaximus@lycos.com> */ +UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, + "Thomson Multimedia Inc.", + "RCA RD1080 MP3 Player", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, "Sandisk", "ImageMate SDDR-05a", |