Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357378
b: refs/heads/master
c: b4c13d3
h: refs/heads/master
v: v3
  • Loading branch information
Paul Bolle authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent ee6c0b2 commit c829ef5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 24dec5dabfcc1d424d7bc86d393d31f57ebcc975
refs/heads/master: b4c13d3df1dfabac3d7737924a0dec665a971484
2 changes: 2 additions & 0 deletions trunk/drivers/media/pci/saa7164/saa7164-encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -1298,6 +1298,7 @@ static int saa7164_g_chip_ident(struct file *file, void *fh,
return 0;
}

#ifdef CONFIG_VIDEO_ADV_DEBUG
static int saa7164_g_register(struct file *file, void *fh,
struct v4l2_dbg_register *reg)
{
Expand All @@ -1323,6 +1324,7 @@ static int saa7164_s_register(struct file *file, void *fh,

return 0;
}
#endif

static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
.vidioc_s_std = vidioc_s_std,
Expand Down

0 comments on commit c829ef5

Please sign in to comment.