~hc/RK356X_SDK_RELEASE.git

..	..	@@ -14,9 +14,9 @@
14	14	#include <linux/string.h>
15	15	#include <linux/uaccess.h>
16	16	#include <linux/vmalloc.h>
	17	+#include <linux/greybus.h>
17	18
18	19	#include "gb-camera.h"
19		-#include "greybus.h"
20	20	#include "greybus_protocols.h"
21	21
22	22	enum gb_camera_debugs_buffer_id {
..	..	@@ -841,8 +841,8 @@
841	841	}
842	842
843	843	static int gb_camera_op_capture(void *priv, u32 request_id,
844		- unsigned int streams, unsigned int num_frames,
845		- size_t settings_size, const void *settings)
	844	+ unsigned int streams, unsigned int num_frames,
	845	+ size_t settings_size, const void *settings)
846	846	{
847	847	struct gb_camera *gcam = priv;
848	848
..	..	@@ -869,7 +869,7 @@
869	869	*/
870	870
871	871	static ssize_t gb_camera_debugfs_capabilities(struct gb_camera *gcam,
872		- char *buf, size_t len)
	872	+ char *buf, size_t len)
873	873	{
874	874	struct gb_camera_debugfs_buffer *buffer =
875	875	&gcam->debugfs.buffers[GB_CAMERA_DEBUGFS_BUFFER_CAPABILITIES];
..	..	@@ -905,7 +905,7 @@
905	905	}
906	906
907	907	static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
908		- char *buf, size_t len)
	908	+ char *buf, size_t len)
909	909	{
910	910	struct gb_camera_debugfs_buffer *buffer =
911	911	&gcam->debugfs.buffers[GB_CAMERA_DEBUGFS_BUFFER_STREAMS];
..	..	@@ -999,7 +999,7 @@
999	999	};
1000	1000
1001	1001	static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam,
1002		- char *buf, size_t len)
	1002	+ char *buf, size_t len)
1003	1003	{
1004	1004	unsigned int request_id;
1005	1005	unsigned int streams_mask;
..	..	@@ -1040,7 +1040,7 @@
1040	1040	}
1041	1041
1042	1042	static ssize_t gb_camera_debugfs_flush(struct gb_camera *gcam,
1043		- char *buf, size_t len)
	1043	+ char *buf, size_t len)
1044	1044	{
1045	1045	struct gb_camera_debugfs_buffer *buffer =
1046	1046	&gcam->debugfs.buffers[GB_CAMERA_DEBUGFS_BUFFER_FLUSH];
..	..	@@ -1190,7 +1190,6 @@
1190	1190	debugfs_create_file(entry->name, entry->mask,
1191	1191	gcam->debugfs.root, gcam,
1192	1192	&gb_camera_debugfs_ops);
1193		- }
1194	1193	}
1195	1194
1196	1195	return 0;