← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/usb/storage/unusual_sddr55.h

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/storage/unusual_sddr55.h
22
22
UNUSUAL_DEV( 0x07c4, 0xa103, 0x0000, 0x9999,
23
23
                "Datafab",
24
24
                "MDSM-B reader",
25
 
                US_SC_SCSI, US_PR_SDDR55, NULL,
 
25
                USB_SC_SCSI, USB_PR_SDDR55, NULL,
26
26
                US_FL_FIX_INQUIRY),
27
27
 
28
28
/* SM part - aeb <Andries.Brouwer@cwi.nl> */
29
29
UNUSUAL_DEV(  0x07c4, 0xa109, 0x0000, 0xffff,
30
30
                "Datafab Systems, Inc.",
31
31
                "USB to CF + SM Combo (LC1)",
32
 
                US_SC_SCSI, US_PR_SDDR55, NULL, 0),
 
32
                USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
33
33
 
34
34
UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
35
35
                "Acomdata",
36
36
                "SM",
37
 
                US_SC_SCSI, US_PR_SDDR55, NULL, 0),
 
37
                USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
38
38
 
39
39
UNUSUAL_DEV(  0x55aa, 0xa103, 0x0000, 0x9999,
40
40
                "Sandisk",
41
41
                "ImageMate SDDR55",
42
 
                US_SC_SCSI, US_PR_SDDR55, NULL, 0),
 
42
                USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
43
43
 
44
44
#endif /* defined(CONFIG_USB_STORAGE_SDDR55) || ... */