← 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_onetouch.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_onetouch.h
24
24
UNUSUAL_DEV(  0x0d49, 0x7000, 0x0000, 0x9999,
25
25
                "Maxtor",
26
26
                "OneTouch External Harddrive",
27
 
                US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input,
 
27
                USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input,
28
28
                0),
29
29
 
30
30
UNUSUAL_DEV(  0x0d49, 0x7010, 0x0000, 0x9999,
31
31
                "Maxtor",
32
32
                "OneTouch External Harddrive",
33
 
                US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input,
 
33
                USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input,
34
34
                0),
35
35
 
36
36
#endif /* defined(CONFIG_USB_STORAGE_ONETOUCH) || ... */