diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /drivers/usb/serial/io_tables.h | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
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 6ab2a3f97fe..178b22eb32b 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, |