diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-25 13:53:43 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-25 13:53:43 +0200 |
| commit | 64693737b66f1ead83aad03febb471e6988ec1f6 (patch) | |
| tree | 86ebbcb4f9bf739af5820cb77c85fa69c0c451e3 /linux/drivers/media/video/gspca/mars.c | |
| parent | e768886b19cdc2ba666bd52faa7797ff4151ced7 (diff) | |
| parent | 838a44104a792f93926bbf9f69e90b6f84c1ddb3 (diff) | |
| download | mediapointer-dvb-s2-64693737b66f1ead83aad03febb471e6988ec1f6.tar.gz mediapointer-dvb-s2-64693737b66f1ead83aad03febb471e6988ec1f6.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/mars.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/mars.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/mars.c b/linux/drivers/media/video/gspca/mars.c index a4706162f..21c4ee56a 100644 --- a/linux/drivers/media/video/gspca/mars.c +++ b/linux/drivers/media/video/gspca/mars.c @@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev, struct cam *cam; cam = &gspca_dev->cam; - cam->dev_name = (char *) id->driver_info; cam->epaddr = 0x01; cam->cam_mode = vga_mode; cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; @@ -421,9 +420,8 @@ static const struct sd_desc sd_desc = { }; /* -- module initialisation -- */ -#define DVNM(name) .driver_info = (kernel_ulong_t) name static const __devinitdata struct usb_device_id device_table[] = { - {USB_DEVICE(0x093a, 0x050f), DVNM("Mars-Semi Pc-Camera")}, + {USB_DEVICE(0x093a, 0x050f)}, {} }; MODULE_DEVICE_TABLE(usb, device_table); |