diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/usb/storage/unusual_devs.h | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 64a0a2c27e1..c932f905318 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -1807,13 +1807,6 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, | |||
| 1807 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1807 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1808 | US_FL_GO_SLOW ), | 1808 | US_FL_GO_SLOW ), |
| 1809 | 1809 | ||
| 1810 | /* Reported by Rohan Hart <rohan.hart17@gmail.com> */ | ||
| 1811 | UNUSUAL_DEV( 0x2770, 0x915d, 0x0010, 0x0010, | ||
| 1812 | "INTOVA", | ||
| 1813 | "Pixtreme", | ||
| 1814 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1815 | US_FL_FIX_CAPACITY ), | ||
| 1816 | |||
| 1817 | /* Reported by Frederic Marchal <frederic.marchal@wowcompany.com> | 1810 | /* Reported by Frederic Marchal <frederic.marchal@wowcompany.com> |
| 1818 | * Mio Moov 330 | 1811 | * Mio Moov 330 |
| 1819 | */ | 1812 | */ |