diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 07:22:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 07:22:55 -0700 |
| commit | 99805f47dd0ede2e96f2c62c588a0d906811ed6d (patch) | |
| tree | b8256eb1e09d04fb986d182528e0cb1becc8dc19 /drivers/usb/storage/unusual_devs.h | |
| parent | a1342206e192709a405485dbe2e647d5c4005d20 (diff) | |
| parent | 9719b0c298bd6a4a608843dc989a5f94cd0a7c13 (diff) | |
| download | kernel_samsung_smdk4412-99805f47dd0ede2e96f2c62c588a0d906811ed6d.tar.gz kernel_samsung_smdk4412-99805f47dd0ede2e96f2c62c588a0d906811ed6d.tar.bz2 kernel_samsung_smdk4412-99805f47dd0ede2e96f2c62c588a0d906811ed6d.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index fa68dea6bc6..bbda63c24c4 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -517,14 +517,32 @@ UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110, 0 ), #endif +/* Submitted by Sven Anderson <sven-linux@anderson.de> + * There are at least four ProductIDs used for iPods, so I added 0x1202 and + * 0x1204. They just need the US_FL_FIX_CAPACITY. As the bcdDevice appears + * to change with firmware updates, I changed the range to maximum for all + * iPod entries. + */ +UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9999, + "Apple", + "iPod", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + /* Reported by Avi Kivity <avi@argo.co.il> */ -UNUSUAL_DEV( 0x05ac, 0x1203, 0x0001, 0x0001, +UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999, + "Apple", + "iPod", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + +UNUSUAL_DEV( 0x05ac, 0x1204, 0x0000, 0x9999, "Apple", "iPod", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY ), -UNUSUAL_DEV( 0x05ac, 0x1205, 0x0001, 0x0001, +UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999, "Apple", "iPod", US_SC_DEVICE, US_PR_DEVICE, NULL, |