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 851f182..bb70401 100644 (file)
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -1,15 +1,29 @@
+/*
+ * Generic Platform Camera Driver Header
+ *
+ * Copyright (C) 2008 Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #ifndef __SOC_CAMERA_H__
 #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;
+       struct device *dev;
        int (*set_capture)(struct soc_camera_platform_info *info, int enable);
+       struct soc_camera_link link;
 };
 
 #endif /* __SOC_CAMERA_H__ */