--- drivers/usb/storage/unusual_devs.h

+++ drivers/usb/storage/unusual_devs.h

@@ -481,13 +481,6 @@ UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x

US_SC_DEVICE, US_PR_DEVICE, NULL,

US_FL_MAX_SECTORS_64),

-/* Reported by Vitaly Kuznetsov <vitty@altlinux.ru> */

-UNUSUAL_DEV( 0x04e8, 0x5122, 0x0000, 0x9999,

- "Samsung",

- "YP-CP3",

- US_SC_DEVICE, US_PR_DEVICE, NULL,

- US_FL_MAX_SECTORS_64 | US_FL_BULK_IGNORE_TAG),

-

/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.

* Device uses standards-violating 32-byte Bulk Command Block Wrappers and

* reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011.

@@ -1043,15 +1036,6 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x

US_SC_DEVICE, US_PR_DEVICE, NULL,

US_FL_BULK32),

-/* Reported by <ttkspam@free.fr>

- * The device reports a vendor-specific device class, requiring an

- * explicit vendor/product match.

- */

-UNUSUAL_DEV( 0x0851, 0x1542, 0x0002, 0x0002,

- "MagicPixel",

- "FW_Omega2",

- US_SC_DEVICE, US_PR_DEVICE, NULL, 0),

-

/* Andrew Lunn <andrew@lunn.ch>

* PanDigital Digital Picture Frame. Does not like ALLOW_MEDIUM_REMOVAL

* on LUN 4.

@@ -1410,13 +1394,6 @@ UNUSUAL_DEV( 0x0fca, 0x0006, 0x0001, 0x

US_FL_IGNORE_DEVICE ),

#endif

-/* Submitted by Nick Holloway */

-UNUSUAL_DEV( 0x0f88, 0x042e, 0x0100, 0x0100,

- "VTech",

- "Kidizoom",

- US_SC_DEVICE, US_PR_DEVICE, NULL,

- US_FL_FIX_CAPACITY ),

-

/* Reported by Michael Stattmann <michael@stattmann.com> */

UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000,

"Sony Ericsson",

@@ -1896,22 +1873,6 @@ UNUSUAL_DEV( 0x1908, 0x1320, 0x0000, 0x0

US_SC_DEVICE, US_PR_DEVICE, NULL,

US_FL_BAD_SENSE ),

-/* Patch by Richard Sch�tz <r.schtz@t-online.de>

- * This external hard drive enclosure uses a JMicron chip which

- * needs the US_FL_IGNORE_RESIDUE flag to work properly. */

-UNUSUAL_DEV( 0x1e68, 0x001b, 0x0000, 0x0000,

- "TrekStor GmbH & Co. KG",

- "DataStation maxi g.u",

- US_SC_DEVICE, US_PR_DEVICE, NULL,

- US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ),

-

-/* Reported by Jasper Mackenzie <scarletpimpernal@hotmail.com> */

-UNUSUAL_DEV( 0x1e74, 0x4621, 0x0000, 0x0000,

- "Coby Electronics",

- "MP3 Player",

- US_SC_DEVICE, US_PR_DEVICE, NULL,

- US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ),

-

UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,

"ST",

"2A",