diff options
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
-rw-r--r-- | drivers/media/video/gspca/gspca.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 59078bbf472c..181617355ec3 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
@@ -79,8 +79,7 @@ typedef int (*cam_streamparm_op) (struct gspca_dev *, | |||
79 | typedef int (*cam_qmnu_op) (struct gspca_dev *, | 79 | typedef int (*cam_qmnu_op) (struct gspca_dev *, |
80 | struct v4l2_querymenu *); | 80 | struct v4l2_querymenu *); |
81 | typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev, | 81 | typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev, |
82 | struct gspca_frame *frame, | 82 | u8 *data, |
83 | __u8 *data, | ||
84 | int len); | 83 | int len); |
85 | 84 | ||
86 | struct ctrl { | 85 | struct ctrl { |
@@ -192,11 +191,10 @@ int gspca_dev_probe(struct usb_interface *intf, | |||
192 | int dev_size, | 191 | int dev_size, |
193 | struct module *module); | 192 | struct module *module); |
194 | void gspca_disconnect(struct usb_interface *intf); | 193 | void gspca_disconnect(struct usb_interface *intf); |
195 | struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, | 194 | void gspca_frame_add(struct gspca_dev *gspca_dev, |
196 | enum gspca_packet_type packet_type, | 195 | enum gspca_packet_type packet_type, |
197 | struct gspca_frame *frame, | 196 | const u8 *data, |
198 | const __u8 *data, | 197 | int len); |
199 | int len); | ||
200 | struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev); | 198 | struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev); |
201 | #ifdef CONFIG_PM | 199 | #ifdef CONFIG_PM |
202 | int gspca_suspend(struct usb_interface *intf, pm_message_t message); | 200 | int gspca_suspend(struct usb_interface *intf, pm_message_t message); |