diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
| commit | 91cb86194d6146eb1da0f838116b5bc752a0c62d (patch) | |
| tree | f9059fb0da363883dbc759d7b68ea1ed5616723a /linux/include/media | |
| parent | dac7e782978c3029d3fa21243295837f262ccac8 (diff) | |
| parent | a325b0a427757946052053834c1dbbc50f89526c (diff) | |
| download | mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.gz mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/soc_camera.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 3e48e435b..7a2fa3ed8 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -38,8 +38,8 @@ struct soc_camera_device { struct soc_camera_ops *ops; struct video_device *vdev; const struct soc_camera_data_format *current_fmt; - int (*probe)(struct soc_camera_device *icd); - void (*remove)(struct soc_camera_device *icd); + const struct soc_camera_data_format *formats; + int num_formats; struct module *owner; /* soc_camera.c private count. Only accessed with video_lock held */ int use_count; @@ -106,6 +106,8 @@ struct soc_camera_data_format { struct soc_camera_ops { struct module *owner; + int (*probe)(struct soc_camera_device *); + void (*remove)(struct soc_camera_device *); int (*init)(struct soc_camera_device *); int (*release)(struct soc_camera_device *); int (*start_capture)(struct soc_camera_device *); @@ -121,8 +123,6 @@ struct soc_camera_ops { int (*get_register)(struct soc_camera_device *, struct v4l2_register *); int (*set_register)(struct soc_camera_device *, struct v4l2_register *); #endif - const struct soc_camera_data_format *formats; - int num_formats; int (*get_control)(struct soc_camera_device *, struct v4l2_control *); int (*set_control)(struct soc_camera_device *, struct v4l2_control *); const struct v4l2_queryctrl *controls; |