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

« back to all changes in this revision

Viewing changes to drivers/usb/serial/siemens_mpi.c

  • 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
[ 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:
22
22
#define DRIVER_DESC "Driver for Siemens USB/MPI adapter"
23
23
 
24
24
 
25
 
static struct usb_device_id id_table[] = {
 
25
static const struct usb_device_id id_table[] = {
26
26
        /* Vendor and product id for 6ES7-972-0CB20-0XA0 */
27
27
        { USB_DEVICE(0x908, 0x0004) },
28
28
        { },
42
42
                .name =         "siemens_mpi",
43
43
        },
44
44
        .id_table =             id_table,
 
45
        .usb_driver =           &siemens_usb_mpi_driver,
45
46
        .num_ports =            1,
46
47
};
47
48