git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/usb-audio' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx23885
/
cx23885-417.c
diff --git
a/drivers/media/video/cx23885/cx23885-417.c
b/drivers/media/video/cx23885/cx23885-417.c
index
e0cf21e
..
1a1048b
100644
(file)
--- a/
drivers/media/video/cx23885/cx23885-417.c
+++ b/
drivers/media/video/cx23885/cx23885-417.c
@@
-1715,6
+1715,8
@@
static struct video_device cx23885_mpeg_template = {
.fops = &mpeg_fops,
.ioctl_ops = &mpeg_ioctl_ops,
.minor = -1,
+ .tvnorms = CX23885_NORMS,
+ .current_norm = V4L2_STD_NTSC_M,
};
void cx23885_417_unregister(struct cx23885_dev *dev)