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/media/pwc/pwc-if.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/media/pwc/pwc-if.c')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index 5524fd70210b..09ca6128ac20 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c | |||
| @@ -111,7 +111,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
| 111 | static void usb_pwc_disconnect(struct usb_interface *intf); | 111 | static void usb_pwc_disconnect(struct usb_interface *intf); |
| 112 | 112 | ||
| 113 | static struct usb_driver pwc_driver = { | 113 | static struct usb_driver pwc_driver = { |
| 114 | .owner = THIS_MODULE, | ||
| 115 | .name = "Philips webcam", /* name */ | 114 | .name = "Philips webcam", /* name */ |
| 116 | .id_table = pwc_device_table, | 115 | .id_table = pwc_device_table, |
| 117 | .probe = usb_pwc_probe, /* probe() */ | 116 | .probe = usb_pwc_probe, /* probe() */ |