Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[safe/jmp/linux-2.6] / include / media / soc_camera_platform.h

diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index 3e8f020..bb70401 100644 (file)
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -17,12 +17,10 @@
 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;