diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/usb/serial/hp4x.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
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 = { |