From f7dcd60d41fc5d8fa431f6147bcbf8194b07d901 Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:15:16 +0800 Subject: [PATCH] --- yaml --- r: 268467 b: refs/heads/master c: 64eb324424071441d047270a9cc04e9ac723d6e1 h: refs/heads/master i: 268465: d3da4f5fa019127b79b7d8f98bacdcbe6a42d097 268463: fffa537d9212661fcc53e1586b4c2833ed302acf v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.h | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 5effe8cdaf46..0d4425617955 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ad6902d2217245ec3dacc7b3e1a91ab3332d7f5 +refs/heads/master: 64eb324424071441d047270a9cc04e9ac723d6e1 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.h b/trunk/drivers/staging/cx25821/cx25821-video.h index 42477884fbcb..e4aa4df0d307 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.h +++ b/trunk/drivers/staging/cx25821/cx25821-video.h @@ -87,7 +87,7 @@ extern struct cx25821_fmt *cx25821_format_by_fourcc(unsigned int fourcc); extern struct cx25821_data timeout_data[MAX_VID_CHANNEL_NUM]; extern void cx25821_dump_video_queue(struct cx25821_dev *dev, - struct cx25821_dmaqueue *q); + struct cx25821_dmaqueue *q); extern void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q, u32 count); @@ -96,11 +96,11 @@ extern int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm); #endif extern int cx25821_res_get(struct cx25821_dev *dev, struct cx25821_fh *fh, - unsigned int bit); + unsigned int bit); extern int cx25821_res_check(struct cx25821_fh *fh, unsigned int bit); extern int cx25821_res_locked(struct cx25821_fh *fh, unsigned int bit); extern void cx25821_res_free(struct cx25821_dev *dev, struct cx25821_fh *fh, - unsigned int bits); + unsigned int bits); extern int cx25821_video_mux(struct cx25821_dev *dev, unsigned int input); extern int cx25821_start_video_dma(struct cx25821_dev *dev, struct cx25821_dmaqueue *q, @@ -119,18 +119,18 @@ extern int cx25821_buffer_setup(struct videobuf_queue *q, unsigned int *count, extern int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, enum v4l2_field field); extern void cx25821_buffer_release(struct videobuf_queue *q, - struct videobuf_buffer *vb); + struct videobuf_buffer *vb); extern struct videobuf_queue *get_queue(struct cx25821_fh *fh); extern int cx25821_get_resource(struct cx25821_fh *fh, int resource); extern int cx25821_video_mmap(struct file *file, struct vm_area_struct *vma); extern int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv, - struct v4l2_format *f); + struct v4l2_format *f); extern int cx25821_vidioc_querycap(struct file *file, void *priv, - struct v4l2_capability *cap); + struct v4l2_capability *cap); extern int cx25821_vidioc_enum_fmt_vid_cap(struct file *file, void *priv, - struct v4l2_fmtdesc *f); + struct v4l2_fmtdesc *f); extern int cx25821_vidioc_reqbufs(struct file *file, void *priv, - struct v4l2_requestbuffers *p); + struct v4l2_requestbuffers *p); extern int cx25821_vidioc_querybuf(struct file *file, void *priv, struct v4l2_buffer *p); extern int cx25821_vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p); @@ -141,16 +141,16 @@ extern int cx25821_vidioc_enum_input(struct file *file, void *priv, extern int cx25821_vidioc_g_input(struct file *file, void *priv, unsigned int *i); extern int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i); extern int cx25821_vidioc_g_ctrl(struct file *file, void *priv, - struct v4l2_control *ctl); + struct v4l2_control *ctl); extern int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv, - struct v4l2_format *f); + struct v4l2_format *f); extern int cx25821_vidioc_g_frequency(struct file *file, void *priv, - struct v4l2_frequency *f); + struct v4l2_frequency *f); extern int cx25821_set_freq(struct cx25821_dev *dev, struct v4l2_frequency *f); extern int cx25821_vidioc_s_frequency(struct file *file, void *priv, - struct v4l2_frequency *f); + struct v4l2_frequency *f); extern int cx25821_vidioc_g_register(struct file *file, void *fh, - struct v4l2_dbg_register *reg); + struct v4l2_dbg_register *reg); extern int cx25821_vidioc_s_register(struct file *file, void *fh, struct v4l2_dbg_register *reg); extern int cx25821_vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t); @@ -161,10 +161,10 @@ extern int cx25821_is_valid_height(u32 height, v4l2_std_id tvnorm); extern int cx25821_vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p); extern int cx25821_vidioc_s_priority(struct file *file, void *f, - enum v4l2_priority prio); + enum v4l2_priority prio); extern int cx25821_vidioc_queryctrl(struct file *file, void *priv, - struct v4l2_queryctrl *qctrl); + struct v4l2_queryctrl *qctrl); extern int cx25821_set_control(struct cx25821_dev *dev, struct v4l2_control *ctrl, int chan_num);