Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / media / usb / tm6000 / tm6000-cards.c

diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
index 307d8c5fb7cd771654a1bc08d0c0f94f45c2d103..1ccaaddaa307874479faf08ccb56ecce76c76cca 100644 (file)
--- a/drivers/media/usb/tm6000/tm6000-cards.c
+++ b/drivers/media/usb/tm6000/tm6000-cards.c
@@ -1114,7 +1114,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
        /* Default values for STD and resolutions */
        dev->width = 720;
        dev->height = 480;
-       dev->norm = V4L2_STD_PAL_M;
+       dev->norm = V4L2_STD_NTSC_M;
 
        /* Configure tuner */
        tm6000_config_tuner(dev);