diff options
Diffstat (limited to 'drivers/media/video/gspca/mars.c')
-rw-r--r-- | drivers/media/video/gspca/mars.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index 88c2b02f380a..21c4ee56a10a 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
@@ -24,9 +24,6 @@ | |||
24 | #include "gspca.h" | 24 | #include "gspca.h" |
25 | #include "jpeg.h" | 25 | #include "jpeg.h" |
26 | 26 | ||
27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 7) | ||
28 | static const char version[] = "2.1.7"; | ||
29 | |||
30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 27 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
31 | MODULE_DESCRIPTION("GSPCA/Mars USB Camera Driver"); | 28 | MODULE_DESCRIPTION("GSPCA/Mars USB Camera Driver"); |
32 | MODULE_LICENSE("GPL"); | 29 | MODULE_LICENSE("GPL"); |
@@ -140,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
140 | struct cam *cam; | 137 | struct cam *cam; |
141 | 138 | ||
142 | cam = &gspca_dev->cam; | 139 | cam = &gspca_dev->cam; |
143 | cam->dev_name = (char *) id->driver_info; | ||
144 | cam->epaddr = 0x01; | 140 | cam->epaddr = 0x01; |
145 | cam->cam_mode = vga_mode; | 141 | cam->cam_mode = vga_mode; |
146 | cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; | 142 | cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; |
@@ -424,9 +420,8 @@ static const struct sd_desc sd_desc = { | |||
424 | }; | 420 | }; |
425 | 421 | ||
426 | /* -- module initialisation -- */ | 422 | /* -- module initialisation -- */ |
427 | #define DVNM(name) .driver_info = (kernel_ulong_t) name | ||
428 | static const __devinitdata struct usb_device_id device_table[] = { | 423 | static const __devinitdata struct usb_device_id device_table[] = { |
429 | {USB_DEVICE(0x093a, 0x050f), DVNM("Mars-Semi Pc-Camera")}, | 424 | {USB_DEVICE(0x093a, 0x050f)}, |
430 | {} | 425 | {} |
431 | }; | 426 | }; |
432 | MODULE_DEVICE_TABLE(usb, device_table); | 427 | MODULE_DEVICE_TABLE(usb, device_table); |
@@ -451,7 +446,7 @@ static int __init sd_mod_init(void) | |||
451 | { | 446 | { |
452 | if (usb_register(&sd_driver) < 0) | 447 | if (usb_register(&sd_driver) < 0) |
453 | return -1; | 448 | return -1; |
454 | PDEBUG(D_PROBE, "v%s registered", version); | 449 | PDEBUG(D_PROBE, "registered"); |
455 | return 0; | 450 | return 0; |
456 | } | 451 | } |
457 | static void __exit sd_mod_exit(void) | 452 | static void __exit sd_mod_exit(void) |