diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:42:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:42:55 +0100 |
| commit | 6a8436419d1b77b24d82bd90354adc4baa393566 (patch) | |
| tree | d20e17b148f37dc299658a60303e6a2e4e6ce63f /drivers/media/video/gspca/gspca.h | |
| parent | 55fa518867978e1f5fd8353098f80d125ac734d7 (diff) | |
| parent | ff75427a7f641c4468610fbda2ccb69218174cd1 (diff) | |
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
| -rw-r--r-- | drivers/media/video/gspca/gspca.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 1d9dc90b479..d25e8d69373 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h @@ -97,7 +97,7 @@ struct sd_desc { cam_pkt_op pkt_scan; /* optional operations */ cam_v_op stopN; /* called on stream off - main alt */ - cam_v_op stop0; /* called on stream off - alt 0 */ + cam_v_op stop0; /* called on stream off & disconnect - alt 0 */ cam_v_op dq_callback; /* called when a frame has been dequeued */ cam_jpg_op get_jcomp; cam_jpg_op set_jcomp; @@ -120,8 +120,8 @@ struct gspca_frame { }; struct gspca_dev { - struct video_device vdev; /* !! must be the first item */ - struct file_operations fops; + struct video_device *vdev; + struct module *module; /* subdriver handling the device */ struct usb_device *dev; struct kref kref; struct file *capt_file; /* file doing video capture */ |