summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/airprime.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 21:08:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 21:08:14 -0700
commit1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch)
tree07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/serial/airprime.c
parent974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff)
parent4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/serial/airprime.c')
-rw-r--r--drivers/usb/serial/airprime.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 926d4c2c1600..1f29d8837327 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -30,9 +30,11 @@ static struct usb_driver airprime_driver = {
.id_table = id_table,
};
-static struct usb_serial_device_type airprime_device = {
- .owner = THIS_MODULE,
- .name = "airprime",
+static struct usb_serial_driver airprime_device = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "airprime",
+ },
.id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,