diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/usb/serial/siemens_mpi.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
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 | ||