diff --git a/[refs] b/[refs] index 44061b782cdb..fbf701847f1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b1fad2f046fb825046fee3a41885a70123de988 +refs/heads/master: 4329f3c6a5fb4ed2332c7552894e7e4b8efef194 diff --git a/trunk/drivers/staging/media/easycap/easycap.h b/trunk/drivers/staging/media/easycap/easycap.h index 1d98d3167d74..9e9638ca8e95 100644 --- a/trunk/drivers/staging/media/easycap/easycap.h +++ b/trunk/drivers/staging/media/easycap/easycap.h @@ -567,7 +567,6 @@ extern bool easycap_readback; extern const struct easycap_standard easycap_standard[]; extern struct easycap_format easycap_format[]; extern struct v4l2_queryctrl easycap_control[]; -extern struct usb_driver easycap_usb_driver; extern struct easycap_dongle easycapdc60_dongle[]; #endif /* !__EASYCAP_H__ */ diff --git a/trunk/drivers/staging/media/easycap/easycap_main.c b/trunk/drivers/staging/media/easycap/easycap_main.c index c147c61caf90..f7af1d284a5e 100644 --- a/trunk/drivers/staging/media/easycap/easycap_main.c +++ b/trunk/drivers/staging/media/easycap/easycap_main.c @@ -4150,7 +4150,7 @@ static struct usb_device_id easycap_usb_device_id_table[] = { }; MODULE_DEVICE_TABLE(usb, easycap_usb_device_id_table); -struct usb_driver easycap_usb_driver = { +static struct usb_driver easycap_usb_driver = { .name = "easycap", .id_table = easycap_usb_device_id_table, .probe = easycap_usb_probe,