diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/serial/siemens_mpi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/serial/siemens_mpi.c')
| -rw-r--r-- | drivers/usb/serial/siemens_mpi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/siemens_mpi.c b/drivers/usb/serial/siemens_mpi.c index cb8195cabfde..74cd4ccdb3fc 100644 --- a/drivers/usb/serial/siemens_mpi.c +++ b/drivers/usb/serial/siemens_mpi.c | |||
| @@ -42,6 +42,7 @@ static struct usb_serial_driver siemens_usb_mpi_device = { | |||
| 42 | .name = "siemens_mpi", | 42 | .name = "siemens_mpi", |
| 43 | }, | 43 | }, |
| 44 | .id_table = id_table, | 44 | .id_table = id_table, |
| 45 | .usb_driver = &siemens_usb_mpi_driver, | ||
| 45 | .num_ports = 1, | 46 | .num_ports = 1, |
| 46 | }; | 47 | }; |
| 47 | 48 | ||