diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
| commit | 46557bef3f3834ac33031c7be27d39d90d507442 (patch) | |
| tree | 5cfc4a9e1263fe0a15e516ca9695ee2f9b8899e4 /include/media/soc_camera_platform.h | |
| parent | 4efc50d697ed8d9a91f0005d922907a7b6c9290d (diff) | |
| parent | d91d8a3f88059d93e34ac70d059153ec69a9ffc7 (diff) | |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
Diffstat (limited to 'include/media/soc_camera_platform.h')
| -rw-r--r-- | include/media/soc_camera_platform.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h index 1d092b4678a..bb70401b814 100644 --- a/include/media/soc_camera_platform.h +++ b/include/media/soc_camera_platform.h @@ -12,15 +12,18 @@ #define __SOC_CAMERA_H__ #include <linux/videodev2.h> +#include <media/soc_camera.h> + +struct device; struct soc_camera_platform_info { - int iface; - char *format_name; + const char *format_name; unsigned long format_depth; struct v4l2_pix_format format; unsigned long bus_param; - void (*power)(int); + struct device *dev; int (*set_capture)(struct soc_camera_platform_info *info, int enable); + struct soc_camera_link link; }; #endif /* __SOC_CAMERA_H__ */ |