diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/usb/serial/hp4x.c | |
| parent | e7c3aad53dba54d375b632f2a21b680546828dec (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/serial/hp4x.c')
| -rw-r--r-- | drivers/usb/serial/hp4x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 8eadfb705601..e9719da2aca1 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c | |||
| @@ -37,11 +37,11 @@ static struct usb_device_id id_table [] = { | |||
| 37 | MODULE_DEVICE_TABLE(usb, id_table); | 37 | MODULE_DEVICE_TABLE(usb, id_table); |
| 38 | 38 | ||
| 39 | static struct usb_driver hp49gp_driver = { | 39 | static struct usb_driver hp49gp_driver = { |
| 40 | .owner = THIS_MODULE, | ||
| 41 | .name = "hp4X", | 40 | .name = "hp4X", |
| 42 | .probe = usb_serial_probe, | 41 | .probe = usb_serial_probe, |
| 43 | .disconnect = usb_serial_disconnect, | 42 | .disconnect = usb_serial_disconnect, |
| 44 | .id_table = id_table, | 43 | .id_table = id_table, |
| 44 | .no_dynamic_id = 1, | ||
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | static struct usb_serial_driver hp49gp_device = { | 47 | static struct usb_serial_driver hp49gp_device = { |