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/misc/emi62.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/misc/emi62.c')
| -rw-r--r-- | drivers/usb/misc/emi62.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 189986af2ac7..52fea2e08db8 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
| @@ -266,7 +266,6 @@ static void emi62_disconnect(struct usb_interface *intf) | |||
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | static struct usb_driver emi62_driver = { | 268 | static struct usb_driver emi62_driver = { |
| 269 | .owner = THIS_MODULE, | ||
| 270 | .name = "emi62 - firmware loader", | 269 | .name = "emi62 - firmware loader", |
| 271 | .probe = emi62_probe, | 270 | .probe = emi62_probe, |
| 272 | .disconnect = emi62_disconnect, | 271 | .disconnect = emi62_disconnect, |