diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/serial/ipw.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
| download | op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/serial/ipw.c')
| -rw-r--r-- | drivers/usb/serial/ipw.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 85e2424..a02fada 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c @@ -443,10 +443,12 @@ static int ipw_disconnect(struct usb_serial_port *port) return 0; } -static struct usb_serial_device_type ipw_device = { - .owner = THIS_MODULE, - .name = "IPWireless converter", - .short_name = "ipw", +static struct usb_serial_driver ipw_device = { + .driver = { + .owner = THIS_MODULE, + .name = "ipw", + }, + .description = "IPWireless converter", .id_table = usb_ipw_ids, .num_interrupt_in = NUM_DONT_CARE, .num_bulk_in = 1, |
