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/net/cdc_ether.c | |
parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/net/cdc_ether.c')
-rw-r--r-- | drivers/usb/net/cdc_ether.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c index c008c981862b..63f1f3ba8e0b 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/usb/net/cdc_ether.c | |||
@@ -476,7 +476,6 @@ static const struct usb_device_id products [] = { | |||
476 | MODULE_DEVICE_TABLE(usb, products); | 476 | MODULE_DEVICE_TABLE(usb, products); |
477 | 477 | ||
478 | static struct usb_driver cdc_driver = { | 478 | static struct usb_driver cdc_driver = { |
479 | .owner = THIS_MODULE, | ||
480 | .name = "cdc_ether", | 479 | .name = "cdc_ether", |
481 | .id_table = products, | 480 | .id_table = products, |
482 | .probe = usbnet_probe, | 481 | .probe = usbnet_probe, |