summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/io_tables.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-02-21 09:43:56 +0100
committerTejun Heo <tj@kernel.org>2011-02-21 09:43:56 +0100
commit43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch)
tree8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/usb/serial/io_tables.h
parent4149efb22da66e326fc48baf80d628834509f7f0 (diff)
parent6f576d57f1fa0d6026b495d8746d56d949989161 (diff)
downloadblackbird-op-linux-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.tar.gz
blackbird-op-linux-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.zip
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.h1
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 = {
.name = "epic",
},
.description = "EPiC device",
+ .usb_driver = &io_driver,
.id_table = Epic_port_id_table,
.num_ports = 1,
.open = edge_open,
OpenPOWER on IntegriCloud