diff options
Diffstat (limited to 'drivers/media/video/gspca/stk014.c')
-rw-r--r-- | drivers/media/video/gspca/stk014.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c index c78ee0d3e59b..16219cf6a6d5 100644 --- a/drivers/media/video/gspca/stk014.c +++ b/drivers/media/video/gspca/stk014.c | |||
@@ -23,9 +23,6 @@ | |||
23 | #include "gspca.h" | 23 | #include "gspca.h" |
24 | #include "jpeg.h" | 24 | #include "jpeg.h" |
25 | 25 | ||
26 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 7) | ||
27 | static const char version[] = "2.1.7"; | ||
28 | |||
29 | MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>"); | 26 | MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>"); |
30 | MODULE_DESCRIPTION("Syntek DV4000 (STK014) USB Camera Driver"); | 27 | MODULE_DESCRIPTION("Syntek DV4000 (STK014) USB Camera Driver"); |
31 | MODULE_LICENSE("GPL"); | 28 | MODULE_LICENSE("GPL"); |
@@ -299,7 +296,6 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
299 | struct sd *sd = (struct sd *) gspca_dev; | 296 | struct sd *sd = (struct sd *) gspca_dev; |
300 | struct cam *cam = &gspca_dev->cam; | 297 | struct cam *cam = &gspca_dev->cam; |
301 | 298 | ||
302 | cam->dev_name = (char *) id->driver_info; | ||
303 | cam->epaddr = 0x02; | 299 | cam->epaddr = 0x02; |
304 | gspca_dev->cam.cam_mode = vga_mode; | 300 | gspca_dev->cam.cam_mode = vga_mode; |
305 | gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); | 301 | gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); |
@@ -549,9 +545,8 @@ static const struct sd_desc sd_desc = { | |||
549 | }; | 545 | }; |
550 | 546 | ||
551 | /* -- module initialisation -- */ | 547 | /* -- module initialisation -- */ |
552 | #define DVNM(name) .driver_info = (kernel_ulong_t) name | ||
553 | static const __devinitdata struct usb_device_id device_table[] = { | 548 | static const __devinitdata struct usb_device_id device_table[] = { |
554 | {USB_DEVICE(0x05e1, 0x0893), DVNM("Syntek DV4000")}, | 549 | {USB_DEVICE(0x05e1, 0x0893)}, |
555 | {} | 550 | {} |
556 | }; | 551 | }; |
557 | MODULE_DEVICE_TABLE(usb, device_table); | 552 | MODULE_DEVICE_TABLE(usb, device_table); |
@@ -576,7 +571,7 @@ static int __init sd_mod_init(void) | |||
576 | { | 571 | { |
577 | if (usb_register(&sd_driver) < 0) | 572 | if (usb_register(&sd_driver) < 0) |
578 | return -1; | 573 | return -1; |
579 | info("v%s registered", version); | 574 | info("registered"); |
580 | return 0; | 575 | return 0; |
581 | } | 576 | } |
582 | static void __exit sd_mod_exit(void) | 577 | static void __exit sd_mod_exit(void) |