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/io_tables.h | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/usb/serial/io_tables.h')
| -rw-r--r-- | drivers/usb/serial/io_tables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h index 6ab2a3f97fe8..178b22eb32b1 100644 --- a/drivers/usb/serial/io_tables.h +++ b/drivers/usb/serial/io_tables.h | |||
| @@ -199,6 +199,7 @@ static struct usb_serial_driver epic_device = { | |||
| 199 | .name = "epic", | 199 | .name = "epic", |
| 200 | }, | 200 | }, |
| 201 | .description = "EPiC device", | 201 | .description = "EPiC device", |
| 202 | .usb_driver = &io_driver, | ||
| 202 | .id_table = Epic_port_id_table, | 203 | .id_table = Epic_port_id_table, |
| 203 | .num_ports = 1, | 204 | .num_ports = 1, |
| 204 | .open = edge_open, | 205 | .open = edge_open, |